mirror of
https://github.com/kristoferssolo/SoloVim.git
synced 2025-10-21 20:10:41 +00:00
Update 04.11.2022
This commit is contained in:
parent
21392d9253
commit
7cf129370e
3
init.lua
3
init.lua
@ -15,7 +15,7 @@ require("user.lualine")
|
|||||||
require("user.toggleterm")
|
require("user.toggleterm")
|
||||||
require("user.project")
|
require("user.project")
|
||||||
require("user.impatient")
|
require("user.impatient")
|
||||||
-- require("user.illuminate")
|
require("user.illuminate")
|
||||||
require("user.indentline")
|
require("user.indentline")
|
||||||
require("user.alpha")
|
require("user.alpha")
|
||||||
require("user.lsp")
|
require("user.lsp")
|
||||||
@ -23,3 +23,4 @@ require("user.dap")
|
|||||||
require("user.vimwiki")
|
require("user.vimwiki")
|
||||||
require("user.whichkey")
|
require("user.whichkey")
|
||||||
require("user.crates")
|
require("user.crates")
|
||||||
|
require("user.colorizer")
|
||||||
|
|||||||
@ -62,7 +62,7 @@ vim.api.nvim_create_autocmd({ "InsertEnter" }, {
|
|||||||
})
|
})
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd({ "FileType" }, {
|
vim.api.nvim_create_autocmd({ "FileType" }, {
|
||||||
pattern = { "c", "cpp", "yaml" },
|
pattern = { "c", "cpp", "yaml", "vimwiki", "markdown", "html", "css", "json" },
|
||||||
callback = function()
|
callback = function()
|
||||||
vim.opt_local.ts = 2
|
vim.opt_local.ts = 2
|
||||||
vim.opt_local.sw = 2
|
vim.opt_local.sw = 2
|
||||||
@ -74,4 +74,10 @@ vim.api.nvim_create_autocmd({ "FileType" }, {
|
|||||||
vim.cmd([[
|
vim.cmd([[
|
||||||
highlight CursorLine ctermbg=White cterm=bold guibg=#222222
|
highlight CursorLine ctermbg=White cterm=bold guibg=#222222
|
||||||
highlight CursorColumn ctermbg=White cterm=bold guibg=#222222
|
highlight CursorColumn ctermbg=White cterm=bold guibg=#222222
|
||||||
|
autocmd FileType python imap <buffer> <C-b> <esc><cmd>w<CR><cmd>exec "!python3" shellescape(@%, 1)<CR>
|
||||||
|
autocmd FileType python map <buffer> <C-b> <cmd>w<CR><cmd>exec "!python3" shellescape(@%, 1)<CR>
|
||||||
|
autocmd FileType rust imap <buffer> <C-b> <esc><cmd>w<CR><cmd>exec "!cargo run"<CR>
|
||||||
|
autocmd FileType rust map <buffer> <C-b> <cmd>w<CR><cmd>exec "!cargo run"<CR>
|
||||||
|
autocmd FileType tex imap <buffer> <C-b> <esc><cmd>w<CR><cmd>exec "silent !lualatex %"<CR>
|
||||||
|
autocmd FileType tex map <buffer> <C-b> <esc><cmd>w<CR><cmd>exec "silent !lualatex %"<CR>
|
||||||
]])
|
]])
|
||||||
|
|||||||
6
lua/user/colorizer.lua
Normal file
6
lua/user/colorizer.lua
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
local status_ok, colorizer = pcall(require, "colorizer")
|
||||||
|
if not status_ok then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
colorizer.setup()
|
||||||
@ -49,7 +49,7 @@ keymap("n", "<A-k>", "<cmd>m .-2<cr>==", opts)
|
|||||||
keymap("n", "]q", "<cmd>cnext<cr>", opts)
|
keymap("n", "]q", "<cmd>cnext<cr>", opts)
|
||||||
keymap("n", "[q", "<cmd>cprev<cr>", opts)
|
keymap("n", "[q", "<cmd>cprev<cr>", opts)
|
||||||
|
|
||||||
keymap("n", "<S-s>", ":%s//<Left>", {})
|
keymap("n", "<S-s>", ":%s///gi<Left><Left><Left><Left>", {})
|
||||||
|
|
||||||
-- Insert --
|
-- Insert --
|
||||||
-- Press jk fast to enter
|
-- Press jk fast to enter
|
||||||
@ -115,4 +115,3 @@ keymap("n", "<leader>dr", "<cmd>lua require'dap'.repl.toggle()<cr>", opts)
|
|||||||
keymap("n", "<leader>dl", "<cmd>lua require'dap'.run_last()<cr>", opts)
|
keymap("n", "<leader>dl", "<cmd>lua require'dap'.run_last()<cr>", opts)
|
||||||
keymap("n", "<leader>du", "<cmd>lua require'dapui'.toggle()<cr>", opts)
|
keymap("n", "<leader>du", "<cmd>lua require'dapui'.toggle()<cr>", opts)
|
||||||
keymap("n", "<leader>dt", "<cmd>lua require'dap'.terminate()<cr>", opts)
|
keymap("n", "<leader>dt", "<cmd>lua require'dap'.terminate()<cr>", opts)
|
||||||
|
|
||||||
|
|||||||
@ -7,7 +7,8 @@ end
|
|||||||
|
|
||||||
M.capabilities = vim.lsp.protocol.make_client_capabilities()
|
M.capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||||
M.capabilities.textDocument.completion.completionItem.snippetSupport = true
|
M.capabilities.textDocument.completion.completionItem.snippetSupport = true
|
||||||
M.capabilities = cmp_nvim_lsp.update_capabilities(M.capabilities)
|
-- M.capabilities = cmp_nvim_lsp.update_capabilities(M.capabilities)
|
||||||
|
M.capabilities = cmp_nvim_lsp.default_capabilities(M.capabilities)
|
||||||
|
|
||||||
M.setup = function()
|
M.setup = function()
|
||||||
local signs = {
|
local signs = {
|
||||||
|
|||||||
@ -45,6 +45,16 @@ for _, server in pairs(servers) do
|
|||||||
opts = vim.tbl_deep_extend("force", pyright_opts, opts)
|
opts = vim.tbl_deep_extend("force", pyright_opts, opts)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- if server == "clangd" then
|
||||||
|
-- local clangd_opts = require("user.lsp.settings.clangd")
|
||||||
|
-- opts = vim.tbl_deep_extend("force", clangd_opts)
|
||||||
|
-- end
|
||||||
|
--
|
||||||
|
-- if server == "html" then
|
||||||
|
-- local html_opts = require("user.lsp.settings.html")
|
||||||
|
-- opts = vim.tbl_deep_extend("force", html_opts)
|
||||||
|
-- end
|
||||||
|
|
||||||
if server == "rust_analyzer" then
|
if server == "rust_analyzer" then
|
||||||
local keymap = vim.keymap.set
|
local keymap = vim.keymap.set
|
||||||
local key_opts = { silent = true }
|
local key_opts = { silent = true }
|
||||||
|
|||||||
@ -24,7 +24,7 @@ null_ls.setup({
|
|||||||
formatting.tidy,
|
formatting.tidy,
|
||||||
formatting.stylelint,
|
formatting.stylelint,
|
||||||
diagnostics.luacheck,
|
diagnostics.luacheck,
|
||||||
diagnostics.flake8,
|
-- diagnostics.flake8,
|
||||||
diagnostics.pylint,
|
diagnostics.pylint,
|
||||||
diagnostics.zsh,
|
diagnostics.zsh,
|
||||||
},
|
},
|
||||||
|
|||||||
@ -66,6 +66,7 @@ return packer.startup(function(use)
|
|||||||
use("folke/tokyonight.nvim")
|
use("folke/tokyonight.nvim")
|
||||||
use("lunarvim/darkplus.nvim")
|
use("lunarvim/darkplus.nvim")
|
||||||
use("Mofiqul/dracula.nvim")
|
use("Mofiqul/dracula.nvim")
|
||||||
|
use("elkowar/yuck.vim")
|
||||||
|
|
||||||
-- Vimwiki
|
-- Vimwiki
|
||||||
use("vimwiki/vimwiki")
|
use("vimwiki/vimwiki")
|
||||||
@ -81,13 +82,12 @@ return packer.startup(function(use)
|
|||||||
-- snippets
|
-- snippets
|
||||||
use("L3MON4D3/LuaSnip") --snippet engine
|
use("L3MON4D3/LuaSnip") --snippet engine
|
||||||
use("rafamadriz/friendly-snippets") -- a bunch of snippets to use
|
use("rafamadriz/friendly-snippets") -- a bunch of snippets to use
|
||||||
use("mattn/emmet-vim")
|
|
||||||
|
|
||||||
-- LSP
|
-- LSP
|
||||||
use("neovim/nvim-lspconfig") -- enable LSP
|
use("neovim/nvim-lspconfig") -- enable LSP
|
||||||
use("williamboman/nvim-lsp-installer") -- simple to use language server installer
|
use("williamboman/nvim-lsp-installer") -- simple to use language server installer
|
||||||
use("jose-elias-alvarez/null-ls.nvim") -- for formatters and linters
|
use("jose-elias-alvarez/null-ls.nvim") -- for formatters and linters
|
||||||
-- use("RRethy/vim-illuminate")
|
use("RRethy/vim-illuminate")
|
||||||
use({ "Saecki/crates.nvim", tag = "v0.3.0" })
|
use({ "Saecki/crates.nvim", tag = "v0.3.0" })
|
||||||
use("simrat39/rust-tools.nvim")
|
use("simrat39/rust-tools.nvim")
|
||||||
use("p00f/clangd_extensions.nvim")
|
use("p00f/clangd_extensions.nvim")
|
||||||
|
|||||||
@ -37,32 +37,33 @@ end
|
|||||||
vim.cmd("autocmd! TermOpen term://* lua set_terminal_keymaps()")
|
vim.cmd("autocmd! TermOpen term://* lua set_terminal_keymaps()")
|
||||||
|
|
||||||
local Terminal = require("toggleterm.terminal").Terminal
|
local Terminal = require("toggleterm.terminal").Terminal
|
||||||
local lazygit = Terminal:new({ cmd = "lazygit", hidden = true })
|
|
||||||
|
|
||||||
|
local lazygit = Terminal:new({ cmd = "lazygit", hidden = true })
|
||||||
function _LAZYGIT_TOGGLE()
|
function _LAZYGIT_TOGGLE()
|
||||||
lazygit:toggle()
|
lazygit:toggle()
|
||||||
end
|
end
|
||||||
|
|
||||||
local node = Terminal:new({ cmd = "node", hidden = true })
|
local node = Terminal:new({ cmd = "node", hidden = true })
|
||||||
|
|
||||||
function _NODE_TOGGLE()
|
function _NODE_TOGGLE()
|
||||||
node:toggle()
|
node:toggle()
|
||||||
end
|
end
|
||||||
|
|
||||||
local ncdu = Terminal:new({ cmd = "ncdu", hidden = true })
|
local ncdu = Terminal:new({ cmd = "ncdu", hidden = true })
|
||||||
|
|
||||||
function _NCDU_TOGGLE()
|
function _NCDU_TOGGLE()
|
||||||
ncdu:toggle()
|
ncdu:toggle()
|
||||||
end
|
end
|
||||||
|
|
||||||
local btop = Terminal:new({ cmd = "btop", hidden = true })
|
local btop = Terminal:new({ cmd = "btop", hidden = true })
|
||||||
|
|
||||||
function _BTOP_TOGGLE()
|
function _BTOP_TOGGLE()
|
||||||
btop:toggle()
|
btop:toggle()
|
||||||
end
|
end
|
||||||
|
|
||||||
local python = Terminal:new({ cmd = "python", hidden = true })
|
local python = Terminal:new({ cmd = "python", hidden = true })
|
||||||
|
|
||||||
function _PYTHON_TOGGLE()
|
function _PYTHON_TOGGLE()
|
||||||
python:toggle()
|
python:toggle()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local rust = Terminal:new({ cmd = "cargo run", hidden = true })
|
||||||
|
function _CARGO_RUN()
|
||||||
|
rust:toggle()
|
||||||
|
end
|
||||||
|
|||||||
@ -35,13 +35,13 @@ configs.setup({
|
|||||||
"hbs",
|
"hbs",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
indent = { enable = true, disable = { "yaml" } },
|
indent = { enable = true, disable = { "" } },
|
||||||
rainbox = {
|
rainbow = {
|
||||||
enable = true,
|
enable = true,
|
||||||
-- disable = { "jsx", "cpp" }, list of languages you want to disable the plugin for
|
-- disable = { "jsx", "cpp" }, list of languages you want to disable the plugin for
|
||||||
extended_mode = true, -- Also highlight non-bracket delimiters like html tags, boolean or table: lang -> boolean
|
extended_mode = true, -- Also highlight non-bracket delimiters like html tags, boolean or table: lang -> boolean
|
||||||
max_file_lines = nil, -- Do not enable for files with more than n lines, int
|
max_file_lines = nil, -- Do not enable for files with more than n lines, int
|
||||||
-- colors = {}, -- table of hex strings
|
-- colors = {}, -- table of hex strings
|
||||||
-- termcolors = {} -- table of colour name strings
|
-- termcolors = {}, -- table of colour name strings
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|||||||
@ -141,7 +141,7 @@ local mappings = {
|
|||||||
|
|
||||||
g = {
|
g = {
|
||||||
name = "Git",
|
name = "Git",
|
||||||
g = { "<cmd>_LAZYGIT_TOGGLE()<cr>", "Lazygit" },
|
g = { "<cmd>lua _LAZYGIT_TOGGLE()<cr>", "Lazygit" },
|
||||||
j = { "<cmd>lua require('gitsigns').next_hunk()<cr>", "Next Hunk" },
|
j = { "<cmd>lua require('gitsigns').next_hunk()<cr>", "Next Hunk" },
|
||||||
k = { "<cmd>lua require('gitsigns').prev_hunk()<cr>", "Prev Hunk" },
|
k = { "<cmd>lua require('gitsigns').prev_hunk()<cr>", "Prev Hunk" },
|
||||||
l = { "<cmd>lua require('gitsigns').blame_line()<cr>", "Blame" },
|
l = { "<cmd>lua require('gitsigns').blame_line()<cr>", "Blame" },
|
||||||
@ -218,6 +218,7 @@ local mappings = {
|
|||||||
u = { "<cmd>lua _NCDU_TOGGLE()<cr>", "NCDU" },
|
u = { "<cmd>lua _NCDU_TOGGLE()<cr>", "NCDU" },
|
||||||
b = { "<cmd>lua _BTOP_TOGGLE()<cr>", "Btop" },
|
b = { "<cmd>lua _BTOP_TOGGLE()<cr>", "Btop" },
|
||||||
p = { "<cmd>lua _PYTHON_TOGGLE()<cr>", "Python" },
|
p = { "<cmd>lua _PYTHON_TOGGLE()<cr>", "Python" },
|
||||||
|
c = { "<cmd>lua _CARGO_RUN()<cr>", "Cargo run" },
|
||||||
f = { "<cmd>ToggleTerm direction=float<cr>", "Float" },
|
f = { "<cmd>ToggleTerm direction=float<cr>", "Float" },
|
||||||
h = { "<cmd>ToggleTerm size=10 direction=horizontal<cr>", "Horizontal" },
|
h = { "<cmd>ToggleTerm size=10 direction=horizontal<cr>", "Horizontal" },
|
||||||
v = { "<cmd>ToggleTerm size=80 direction=vertical<cr>", "Vertical" },
|
v = { "<cmd>ToggleTerm size=80 direction=vertical<cr>", "Vertical" },
|
||||||
@ -235,9 +236,15 @@ local mappings = {
|
|||||||
d = { "<Plug>VimwikiDeleteFile", "Rename file" },
|
d = { "<Plug>VimwikiDeleteFile", "Rename file" },
|
||||||
r = { "<Plug>VimwikiRenameFile", "Delete file" },
|
r = { "<Plug>VimwikiRenameFile", "Delete file" },
|
||||||
},
|
},
|
||||||
T = {
|
L = {
|
||||||
name = "Treesitter",
|
name = "Language settings",
|
||||||
i = { "<cmd>TSConfigInfo<cr>", "Info" },
|
c = { "<cmd>setlocal formatoptions-=cro<CR>", "Disable autocomment" },
|
||||||
|
C = { "<cmd>setlocal formatoptions=cro<CR>", "Enable autocomment" },
|
||||||
|
s = { "<cmd>setlocal spell!<CR>", "Toggle spellchecker" },
|
||||||
|
e = { "<cmd>setlocal spell spelllang=en_us<CR>", "Enable English spellchecker" },
|
||||||
|
l = { "<cmd>setlocal spell spelllang=lv_LV<CR>", "Enable Lavian spellchecker" },
|
||||||
|
I = { "<cmd>setlocal autoindent<CR>", "Enable autoindent" },
|
||||||
|
i = { "<cmd>setlocal noautoindent<CR>", "Disable autoindent" },
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user