mirror of
https://github.com/tiyn/dotfiles.git
synced 2025-04-20 00:37:44 +02:00
Compare commits
No commits in common. "62ee4ff09a4aa8c077d74b9a9fb3792b1561b2bc" and "cf0389b1d32cfb24db8e84d0b13d347a96a54797" have entirely different histories.
62ee4ff09a
...
cf0389b1d3
@ -32,11 +32,10 @@ alias drop="dragon-drop"
|
|||||||
|
|
||||||
# fzf
|
# fzf
|
||||||
src() { find ~/.config/* ~/.local/bin/* -type f | fzf | xargs -r $EDITOR ;}
|
src() { find ~/.config/* ~/.local/bin/* -type f | fzf | xargs -r $EDITOR ;}
|
||||||
srd() { find ~/cloud/* -type f | grep ".pdf" | fzf | xargs -r $READER ;}
|
srd() { find ~/nextCloud/* -type f | grep ".pdf" | fzf | xargs -r $READER ;}
|
||||||
|
|
||||||
yaya() { yay -Slq | fzf --reverse --prompt="yay install > " -q "$1" -m --preview 'yay -Si {1}'| xargs -ro yay -S }
|
yaya() { yay -Slq | fzf --reverse --prompt="yay install > " -q "$1" -m --preview 'yay -Si {1}'| xargs -ro yay -S }
|
||||||
yayr() { yay -Qq | fzf --reverse --prompt="yay remove > " -q "$1" -m --preview 'yay -Qi {1}' | xargs -ro yay -Rns }
|
yayr() { yay -Qq | fzf --reverse --prompt="yay remove > " -q "$1" -m --preview 'yay -Qi {1}' | xargs -ro yay -Rns }
|
||||||
yayu() { yay -Qqe | fzf --reverse --prompt="yay install > " -q "$1" -m --preview 'yay -Si {1}'| xargs -ro yay -S }
|
|
||||||
|
|
||||||
# ghb
|
# ghb
|
||||||
alias vidcoder="ghb"
|
alias vidcoder="ghb"
|
||||||
|
@ -65,18 +65,11 @@ vim.o.undodir = vim.env.XDG_CACHE_HOME .. "/vim/undo"
|
|||||||
vim.g.python_host_prog = '/usr/bin/python2'
|
vim.g.python_host_prog = '/usr/bin/python2'
|
||||||
vim.g.python3_host_prog = '/usr/bin/python3'
|
vim.g.python3_host_prog = '/usr/bin/python3'
|
||||||
|
|
||||||
-- display certain invisible chars
|
-- append
|
||||||
vim.opt.list = true
|
vim.opt.list = true
|
||||||
vim.opt.listchars:append "space:·"
|
vim.opt.listchars:append "space:·"
|
||||||
vim.opt.listchars:append "eol:"
|
vim.opt.listchars:append "eol:"
|
||||||
|
|
||||||
-- folding
|
|
||||||
vim.o.foldcolumn = '0'
|
|
||||||
vim.o.foldlevel = 99
|
|
||||||
vim.o.foldlevelstart = 99
|
|
||||||
vim.o.foldenable = true
|
|
||||||
|
|
||||||
|
|
||||||
-- set filetypes correctly by extension
|
-- set filetypes correctly by extension
|
||||||
require('autocmd')
|
require('autocmd')
|
||||||
|
|
||||||
|
@ -104,10 +104,6 @@ return require("packer").startup(function(use)
|
|||||||
requires = { 'nvim-treesitter/nvim-treesitter' }
|
requires = { 'nvim-treesitter/nvim-treesitter' }
|
||||||
}
|
}
|
||||||
|
|
||||||
-- folding improvements
|
|
||||||
use { 'kevinhwang91/nvim-ufo',
|
|
||||||
requires = 'kevinhwang91/promise-async' }
|
|
||||||
|
|
||||||
-- colorful brackets
|
-- colorful brackets
|
||||||
use { 'luochen1990/rainbow' }
|
use { 'luochen1990/rainbow' }
|
||||||
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
-- tiyn/vim-tccs
|
-- tiyn/vim-tccs
|
||||||
vim.cmd('colorscheme tccs')
|
vim.cmd('colorscheme tccs')
|
||||||
vim.api.nvim_set_hl(0, 'colorcolumn', { bg = '#772222' })
|
vim.api.nvim_set_hl(0, 'colorcolumn', { bg = '#772222' })
|
||||||
|
|
||||||
|
@ -2,12 +2,6 @@
|
|||||||
require('lualine').setup {
|
require('lualine').setup {
|
||||||
options = {
|
options = {
|
||||||
icons_enabled = true,
|
icons_enabled = true,
|
||||||
symbols = {
|
|
||||||
error = '',
|
|
||||||
warn = '',
|
|
||||||
hint = '',
|
|
||||||
info = '',
|
|
||||||
},
|
|
||||||
theme = 'tccs',
|
theme = 'tccs',
|
||||||
component_separators = { left = '', right = '' },
|
component_separators = { left = '', right = '' },
|
||||||
section_separators = { left = '', right = '' },
|
section_separators = { left = '', right = '' },
|
||||||
|
@ -113,7 +113,6 @@ require("mason").setup()
|
|||||||
-- williamboman/mason-lspconfig.nvim
|
-- williamboman/mason-lspconfig.nvim
|
||||||
require("mason-lspconfig").setup({
|
require("mason-lspconfig").setup({
|
||||||
automatic_setup = true,
|
automatic_setup = true,
|
||||||
ensure_installed = { "pyright", "bashls", "texlab", "nimls", "marksman", "jdtls", "lua_ls" }
|
|
||||||
})
|
})
|
||||||
|
|
||||||
-- jay-babu/mason-null-ls.nvim
|
-- jay-babu/mason-null-ls.nvim
|
||||||
@ -139,22 +138,16 @@ local cmp_nvim_lsp = require("cmp_nvim_lsp")
|
|||||||
-- neovim/nvim-lspconfig
|
-- neovim/nvim-lspconfig
|
||||||
local nvim_lsp = require('lspconfig')
|
local nvim_lsp = require('lspconfig')
|
||||||
|
|
||||||
local servers = { "pyright", "bashls", "texlab", "nimls", "marksman" }
|
local servers = { "pyright", "bashls", "texlab", "ccls", "nimls", "marksman" }
|
||||||
|
|
||||||
local attach_func = function(client, bufnr)
|
local attach_func = function(client, bufnr)
|
||||||
navbuddy.attach(client, bufnr)
|
navbuddy.attach(client, bufnr)
|
||||||
end
|
end
|
||||||
|
|
||||||
local capabilities = cmp_nvim_lsp.default_capabilities()
|
|
||||||
capabilities.textDocument.foldingRange = {
|
|
||||||
dynamicRegistration = false,
|
|
||||||
lineFoldingOnly = true
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, lsp in ipairs(servers) do
|
for _, lsp in ipairs(servers) do
|
||||||
nvim_lsp[lsp].setup {
|
nvim_lsp[lsp].setup {
|
||||||
on_attach = attach_func,
|
on_attach = attach_func,
|
||||||
capabilities = capabilities,
|
capabilities = cmp_nvim_lsp.default_capabilities(),
|
||||||
flags = {
|
flags = {
|
||||||
debounce_text_changes = 150
|
debounce_text_changes = 150
|
||||||
}
|
}
|
||||||
@ -163,7 +156,6 @@ end
|
|||||||
|
|
||||||
require 'lspconfig'.jdtls.setup {
|
require 'lspconfig'.jdtls.setup {
|
||||||
on_attach = attach_func,
|
on_attach = attach_func,
|
||||||
capabilities = capabilities,
|
|
||||||
flags = {
|
flags = {
|
||||||
debounce_text_changes = 150
|
debounce_text_changes = 150
|
||||||
},
|
},
|
||||||
@ -172,7 +164,6 @@ require 'lspconfig'.jdtls.setup {
|
|||||||
|
|
||||||
require 'lspconfig'.lua_ls.setup {
|
require 'lspconfig'.lua_ls.setup {
|
||||||
on_attach = attach_func,
|
on_attach = attach_func,
|
||||||
capabilities = capabilities,
|
|
||||||
settings = {
|
settings = {
|
||||||
Lua = {
|
Lua = {
|
||||||
runtime = { version = 'LuaJIT' },
|
runtime = { version = 'LuaJIT' },
|
||||||
@ -182,22 +173,3 @@ require 'lspconfig'.lua_ls.setup {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
require('ufo').setup()
|
|
||||||
|
|
||||||
vim.fn.sign_define(
|
|
||||||
"DiagnosticSignError",
|
|
||||||
{ texthl = "DiagnosticSignError", text = "", numhl = "DiagnosticSignError" }
|
|
||||||
)
|
|
||||||
vim.fn.sign_define(
|
|
||||||
"DiagnosticSignWarn",
|
|
||||||
{ texthl = "DiagnosticSignWarn", text = "", numhl = "DiagnosticSignWarn" }
|
|
||||||
)
|
|
||||||
vim.fn.sign_define(
|
|
||||||
"DiagnosticSignInfo",
|
|
||||||
{ texthl = "DiagnosticSignInfo", text = "", numhl = "DiagnosticSignInfo" }
|
|
||||||
)
|
|
||||||
vim.fn.sign_define(
|
|
||||||
"DiagnosticSignHint",
|
|
||||||
{ texthl = "DiagnosticSignHint", text = "", numhl = "DiagnosticSignHint" }
|
|
||||||
)
|
|
||||||
|
@ -5,13 +5,12 @@ require 'todo-comments'.setup {
|
|||||||
sign_priority = 8, -- sign priority
|
sign_priority = 8, -- sign priority
|
||||||
-- keywords recognized as todo comments
|
-- keywords recognized as todo comments
|
||||||
keywords = {
|
keywords = {
|
||||||
ERRO = { icon = " ", color = "error" },
|
ERRO = { icon = " ", color = "error" },
|
||||||
TODO = { icon = " ", color = "info" },
|
TODO = { icon = " ", color = "info" },
|
||||||
WARN = { icon = " ", color = "warning" },
|
|
||||||
HACK = { icon = " ", color = "warning" },
|
HACK = { icon = " ", color = "warning" },
|
||||||
PERF = { icon = " ", color = "perfect" },
|
WARN = { icon = " ", color = "warning" },
|
||||||
HINT = { icon = " ", color = "hint" },
|
PERF = { icon = " ", color = "default" },
|
||||||
INFO = { icon = " ", color = "hint", alt = { "NOTE" } },
|
NOTE = { icon = " ", color = "hint" },
|
||||||
TEST = { icon = " ", color = "test" },
|
TEST = { icon = " ", color = "test" },
|
||||||
},
|
},
|
||||||
gui_style = {
|
gui_style = {
|
||||||
@ -38,11 +37,11 @@ require 'todo-comments'.setup {
|
|||||||
-- list of named colors where we try to extract the guifg from the
|
-- list of named colors where we try to extract the guifg from the
|
||||||
-- list of highlight groups or use the hex color if hl not found as a fallback
|
-- list of highlight groups or use the hex color if hl not found as a fallback
|
||||||
colors = {
|
colors = {
|
||||||
error = { "DiagnosticSignError", "ErrorMsg", "#DC2626" },
|
error = { "DiagnosticError", "ErrorMsg", "#DC2626" },
|
||||||
warning = { "DiagnosticSignWarn", "WarningMsg", "#FBBF24" },
|
warning = { "WarningMsg", "DiagnosticWarn", "#FBBF24" },
|
||||||
info = { "Comment", "#2563EB" },
|
info = { "Constant", "#2563EB" },
|
||||||
hint = { "Constant", "#10B981" },
|
hint = { "Comment", "#10B981" },
|
||||||
perfect = { "Operator", "#7C3AED" },
|
default = { "Operator", "#7C3AED" },
|
||||||
test = { "Function", "#FF00FF" }
|
test = { "Function", "#FF00FF" }
|
||||||
},
|
},
|
||||||
search = {
|
search = {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user