Update config
This commit is contained in:
117
lvim/config.lua
117
lvim/config.lua
@@ -17,8 +17,8 @@ vim.opt.softtabstop = 4
|
||||
vim.opt.shiftwidth = 4
|
||||
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
pattern = "cpp",
|
||||
command = "setlocal shiftwidth=2 tabstop=2"
|
||||
pattern = "cpp",
|
||||
command = "setlocal shiftwidth=2 tabstop=2"
|
||||
})
|
||||
-- keymappings [view all the defaults by pressing <leader>Lk]
|
||||
lvim.leader = "space"
|
||||
@@ -27,9 +27,9 @@ lvim.keys.normal_mode["<C-s>"] = ":w<cr>"
|
||||
lvim.builtin.terminal.open_mapping = "<c-t>"
|
||||
|
||||
-- Use which-key to add extra bindings with the leader-key prefix
|
||||
lvim.builtin.which_key.mappings["g"].g = {"<cmd>ToggleTerm<cr><cmd>TermExec cmd='gitui&&exit'<CR>", "Gitui"}
|
||||
lvim.builtin.which_key.mappings["s"].B = {"<cmd>Telescope git_branches<CR>", "Checkout branch"}
|
||||
lvim.builtin.which_key.mappings["s"].b = {"<cmd>Telescope buffers<CR>", "Buffer"}
|
||||
lvim.builtin.which_key.mappings["g"].g = { "<cmd>ToggleTerm<cr><cmd>TermExec cmd='gitui&&exit'<CR>", "Gitui" }
|
||||
lvim.builtin.which_key.mappings["s"].B = { "<cmd>Telescope git_branches<CR>", "Checkout branch" }
|
||||
lvim.builtin.which_key.mappings["s"].b = { "<cmd>Telescope buffers<CR>", "Buffer" }
|
||||
lvim.builtin.which_key.mappings["t"] = {
|
||||
name = "+Terminal",
|
||||
r = { "<cmd>ToggleTerm<cr>", "Floating terminal" },
|
||||
@@ -82,8 +82,8 @@ lvim.plugins = {
|
||||
require("auto-save").setup()
|
||||
end,
|
||||
},
|
||||
{'kevinhwang91/nvim-ufo'},
|
||||
{'kevinhwang91/promise-async'},
|
||||
{ 'kevinhwang91/nvim-ufo' },
|
||||
{ 'kevinhwang91/promise-async' },
|
||||
-- Markdonw
|
||||
{
|
||||
"iamcco/markdown-preview.nvim",
|
||||
@@ -94,11 +94,11 @@ lvim.plugins = {
|
||||
'saecki/crates.nvim',
|
||||
-- ft = {"toml"},
|
||||
config = function(_, opts)
|
||||
local crates = require('crates')
|
||||
local crates = require('crates')
|
||||
crates.setup({
|
||||
null_ls = {
|
||||
enabled = true,
|
||||
name = "crates.nvim",
|
||||
enabled = true,
|
||||
name = "crates.nvim",
|
||||
},
|
||||
})
|
||||
require('cmp').setup.buffer({
|
||||
@@ -107,13 +107,13 @@ lvim.plugins = {
|
||||
crates.show()
|
||||
end,
|
||||
},
|
||||
{
|
||||
"simrat39/rust-tools.nvim",
|
||||
{
|
||||
"simrat39/rust-tools.nvim",
|
||||
-- ft = { "rust", "rs" }, -- IMPORTANT: re-enabling this seems to break inlay-hints
|
||||
config = function()
|
||||
require("rust-tools").setup {
|
||||
tools = {
|
||||
executor = require("rust-tools/executors").termopen, -- can be quickfix or termopen
|
||||
executor = require("rust-tools/executors").termopen, -- can be quickfix or termopen
|
||||
reload_workspace_from_cargo_toml = true,
|
||||
inlay_hints = {
|
||||
auto = true,
|
||||
@@ -161,60 +161,61 @@ lvim.plugins = {
|
||||
},
|
||||
}
|
||||
end,
|
||||
},
|
||||
{"slint-ui/vim-slint"},
|
||||
-- Java
|
||||
{
|
||||
'hdiniz/vim-gradle'
|
||||
},
|
||||
-- Deno
|
||||
{'sigmasd/deno-nvim'}
|
||||
{ "slint-ui/vim-slint" },
|
||||
-- Java
|
||||
{ 'hdiniz/vim-gradle' },
|
||||
{ "mfussenegger/nvim-jdtls", },
|
||||
-- Deno
|
||||
{ 'sigmasd/deno-nvim' }
|
||||
}
|
||||
-- folding
|
||||
-- folding
|
||||
vim.o.foldcolumn = '2' -- '0' is not bad
|
||||
vim.o.foldlevel = 99-- Using ufo provider need a large value, feel free to decrease the value
|
||||
vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value
|
||||
vim.o.foldlevelstart = 99
|
||||
vim.o.foldenable = true
|
||||
vim.opt.fillchars = {
|
||||
vert = "▕", -- alternatives │
|
||||
fold = " ",
|
||||
eob = " ", -- suppress ~ at EndOfBuffer
|
||||
diff = "╱", -- alternatives = ⣿ ░ ─
|
||||
msgsep = "‾",
|
||||
foldopen = "",
|
||||
foldsep = "│",
|
||||
foldclose = "",
|
||||
}
|
||||
vim.opt.fillchars = {
|
||||
vert = "▕", -- alternatives │
|
||||
fold = " ",
|
||||
eob = " ", -- suppress ~ at EndOfBuffer
|
||||
diff = "╱", -- alternatives = ⣿ ░ ─
|
||||
msgsep = "‾",
|
||||
foldopen = "",
|
||||
foldsep = "│",
|
||||
foldclose = "",
|
||||
}
|
||||
local fcs = vim.opt.fillchars:get()
|
||||
|
||||
-- Stolen from Akinsho
|
||||
local function get_fold(lnum)
|
||||
if vim.fn.foldlevel(lnum) <= vim.fn.foldlevel(lnum - 1)
|
||||
then return ' '
|
||||
end
|
||||
local fold_sym =
|
||||
vim.fn.foldclosed(lnum) == -1 and fcs.foldopen or fcs.foldclose
|
||||
return fold_sym
|
||||
end
|
||||
local function get_fold(lnum)
|
||||
if vim.fn.foldlevel(lnum) <= vim.fn.foldlevel(lnum - 1)
|
||||
then
|
||||
return ' '
|
||||
end
|
||||
local fold_sym =
|
||||
vim.fn.foldclosed(lnum) == -1 and fcs.foldopen or fcs.foldclose
|
||||
return fold_sym
|
||||
end
|
||||
_G.get_statuscol = function() return "%s%l " .. get_fold(vim.v.lnum) .. " " end
|
||||
vim.o.statuscolumn = "%!v:lua.get_statuscol()"
|
||||
|
||||
|
||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||
capabilities.textDocument.foldingRange = {
|
||||
dynamicRegistration = false,
|
||||
lineFoldingOnly = true
|
||||
dynamicRegistration = false,
|
||||
lineFoldingOnly = true
|
||||
}
|
||||
local language_servers = require("lspconfig").util.available_servers() -- or list servers manually like {'gopls', 'clangd'}
|
||||
for _, ls in ipairs(language_servers) do
|
||||
require('lspconfig')[ls].setup({
|
||||
capabilities = capabilities
|
||||
-- you can add other fields for setting up lsp server in this table
|
||||
})
|
||||
require('lspconfig')[ls].setup({
|
||||
capabilities = capabilities
|
||||
-- you can add other fields for setting up lsp server in this table
|
||||
})
|
||||
end
|
||||
require('ufo').setup()
|
||||
|
||||
-- Java
|
||||
vim.list_extend(lvim.lsp.automatic_configuration.skipped_servers, { "jdtls" })
|
||||
local lspconfig = require('lspconfig')
|
||||
local lombok = vim.fn.stdpath('data') .. '/mason/packages/jdtls/lombok.jar'
|
||||
lspconfig.jdtls.setup { cmd = { "jdtls", "--jvm-arg=-javaagent:" .. lombok } }
|
||||
@@ -223,7 +224,7 @@ lspconfig.jdtls.setup { cmd = { "jdtls", "--jvm-arg=-javaagent:" .. lombok } }
|
||||
local nvim_lsp = require("lspconfig")
|
||||
nvim_lsp.denols.setup {
|
||||
on_attach = on_attach,
|
||||
root_dir = nvim_lsp.util.root_pattern("deno.jsonc","deno.json"),
|
||||
root_dir = nvim_lsp.util.root_pattern("deno.jsonc", "deno.json"),
|
||||
init_options = {
|
||||
lint = true,
|
||||
},
|
||||
@@ -246,18 +247,18 @@ require("deno-nvim").setup({
|
||||
})
|
||||
|
||||
-- Themes
|
||||
require('onedark').setup {
|
||||
style = 'darker', -- Default theme style. Choose between 'dark', 'darker', 'cool', 'deep', 'warm', 'warmer' and 'light'
|
||||
toggle_style_key = "<leader>ss";
|
||||
transparent = false, -- Show/hide background
|
||||
require('onedark').setup {
|
||||
style = 'darker', -- Default theme style. Choose between 'dark', 'darker', 'cool', 'deep', 'warm', 'warmer' and 'light'
|
||||
toggle_style_key = "<leader>ss",
|
||||
transparent = false, -- Show/hide background
|
||||
|
||||
code_style = {
|
||||
comments = 'italic',
|
||||
keywords = 'italic,',
|
||||
functions = 'bold',
|
||||
strings = 'none',
|
||||
variables = 'none'
|
||||
},
|
||||
code_style = {
|
||||
comments = 'italic',
|
||||
keywords = 'italic,',
|
||||
functions = 'bold',
|
||||
strings = 'none',
|
||||
variables = 'none'
|
||||
},
|
||||
}
|
||||
--
|
||||
|
||||
|
||||
2
ohmyzsh
2
ohmyzsh
Submodule ohmyzsh updated: 80c114cb3a...bf713e2c11
4
zshrc
4
zshrc
@@ -7,6 +7,7 @@ export PATH="/home/jika/Scripts/:/home/jika/.cargo/bin:$PATH"
|
||||
export PATH="/home/jika/.local/bin:/home/jika/.deno/bin:$PATH"
|
||||
export RR_STATION="teo"
|
||||
export RUSTC_WRAPPER=~/.cargo/bin/sccache
|
||||
export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/podman/podman.sock
|
||||
# Set name of the theme to load --- if set to "random", it will
|
||||
# load a random theme each time oh-my-zsh is loaded, in which case,
|
||||
# to know which specific one was loaded, run: echo $RANDOM_THEME
|
||||
@@ -104,6 +105,7 @@ source $ZSH/oh-my-zsh.sh
|
||||
#
|
||||
# Example aliases
|
||||
alias sshh='fast-ssh'
|
||||
alias gitui='eval `ssh-agent -s` && ssh-add && gitui'
|
||||
# alias zshconfig="mate ~/.zshrc"
|
||||
# alias ohmyzsh="mate ~/.oh-my-zsh"
|
||||
alias open='~/.local/bin/open.sh'
|
||||
@@ -121,7 +123,7 @@ alias grep='rg'
|
||||
alias du='dust'
|
||||
|
||||
# ls
|
||||
alias ls='eza --icons=always'
|
||||
alias ls='eza --icons=always --git'
|
||||
alias l='ls -lb'
|
||||
alias l1='ls -1'
|
||||
alias ll='ls -lab'
|
||||
|
||||
Reference in New Issue
Block a user