This commit is contained in:
Zoe Roux
2022-10-19 22:08:00 +09:00
parent 9403253e21
commit 3365f7d18b
9 changed files with 75 additions and 36 deletions

View File

@@ -5,6 +5,7 @@ pulseaudio-bluetooth
bluez
bluez-utils
bluetooth-autoconnect
brightnessctl
# DE like tools
dunst

View File

@@ -233,6 +233,7 @@ blur-background-exclude = [
"window_type = 'desktop'",
"window_type = 'popup_menu'",
"window_type = 'tooltip'",
"name *= 'rect-overlay'",
#"class_g = 'URxvt'",
#
# prevents picom from blurring the background

View File

@@ -28,5 +28,11 @@ XF86AudioStop
{XF86AudioPrev,XF86AudioNext}
playerctl {previous,next}
{XF86MonBrightnessDown,XF86MonBrightnessUp}
brightnessctl set 10%{-,+}
super + shift + l
fcitx5-remote -t
Print
maim -s | xclip -selection clipboard -t image/png

Binary file not shown.

After

Width:  |  Height:  |  Size: 134 KiB

View File

@@ -23,11 +23,6 @@ M.setup = function()
border = "rounded",
})
local ok, inlay = pcall(require, "lsp-inlayhints")
if ok then
inlay.setup()
end
local shok, sh = pcall(require, "nvim-semantic-tokens")
if shok then
sh.setup {
@@ -57,7 +52,7 @@ wk.register({
["<leader>l"] = {
name = "LSP",
i = { "<cmd>LspInfo<cr>", "Info" },
I = { "<cmd>LspInstallInfo<cr>", "Installer Info" },
I = { "<cmd>Mason<cr>", "Installer Info" },
},
})
@@ -105,10 +100,18 @@ local lsp_codelens = function()
-- vim.cmd [[ autocmd BufEnter,CursorHold,InsertLeave <buffer> lua vim.lsp.codelens.refresh() ]]
end
local lsp_semhighlight = function(client)
local lsp_semhighlight = function(client, bufnr)
local caps = client.server_capabilities
if caps.semanticTokensProvider and caps.semanticTokensProvider.full then
vim.cmd [[autocmd BufEnter,CursorHold,InsertLeave <buffer> lua vim.lsp.buf.semantic_tokens_full()]]
local augroup = vim.api.nvim_create_augroup("SemanticTokens", {})
vim.api.nvim_create_autocmd("TextChanged", {
group = augroup,
buffer = bufnr,
callback = function()
vim.lsp.buf.semantic_tokens_full()
end,
})
vim.lsp.buf.semantic_tokens_full()
end
end
@@ -116,9 +119,8 @@ M.on_attach = function(client, bufnr)
lsp_keymaps(bufnr)
lsp_highlight_document(client)
lsp_codelens()
lsp_semhighlight(client)
lsp_semhighlight(client, bufnr)
require("lsp-inlayhints").on_attach(client, bufnr)
require "nvim-navic".attach(client, bufnr)
end
@@ -129,7 +131,7 @@ if not status_ok then
return M
end
M.capabilities = cmp_nvim_lsp.update_capabilities(capabilities)
M.capabilities = cmp_nvim_lsp.default_capabilities()
return M

View File

@@ -1,9 +1,31 @@
local ok, lspconfig = pcall(require, "lspconfig")
local status_ok, lsp_installer = pcall(require, "nvim-lsp-installer")
if not status_ok or not ok then
local status_ok, mason = pcall(require, "mason")
local lspok, mason_lsp = pcall(require, "mason-lspconfig")
local fmtok, mason_fmt = pcall(require, "mason-null-ls")
if not fmtok or not lspok or not status_ok or not ok then
return
end
mason.setup({
ui = {
icons = {
package_installed = "",
package_pending = "",
package_uninstalled = ""
}
}
})
mason_lsp.setup({
automatic_installation = true,
})
mason_fmt.setup({
automatic_installation = true,
ensure_installed = { "eslint_d", "prettierd" },
})
local util = require "lspconfig.util"
util.on_setup = util.add_hook_after(util.on_setup, function(config)
local opts = {
@@ -19,16 +41,6 @@ util.on_setup = util.add_hook_after(util.on_setup, function(config)
config.capabilities = opts.capabilities
end)
lsp_installer.setup({
ui = {
icons = {
server_installed = "",
server_pending = "",
server_uninstalled = ""
}
}
})
local servers = {}
lspconfig.omnisharp.setup({
@@ -132,8 +144,8 @@ local function contains(table, val)
return false
end
for _, server in ipairs(lsp_installer.get_installed_servers()) do
if not contains(servers, server.name) then
lspconfig[server.name].setup({})
for _, server in ipairs(mason_lsp.get_installed_servers()) do
if not contains(servers, server) then
lspconfig[server].setup({})
end
end

View File

@@ -5,10 +5,10 @@ end
local u = require("null-ls.utils")
local sources = {
nl.builtins.code_actions.eslint,
nl.builtins.diagnostics.eslint,
nl.builtins.formatting.eslint,
nl.builtins.formatting.prettier,
nl.builtins.code_actions.eslint_d,
nl.builtins.diagnostics.eslint_d,
nl.builtins.formatting.eslint_d,
nl.builtins.formatting.prettierd,
}
nl.setup({
debug = false,

View File

@@ -90,18 +90,16 @@ return packer.startup(function(use)
}
use "nvim-lualine/lualine.nvim"
use { "RRethy/vim-hexokinase", run = "make hexokinase", config = function()
vim.g["Hexokinase_optInPatterns"] = "full_hex,triple_hex,rgb,rgba,hsl,hsla"
end }
use "NvChad/nvim-colorizer.lua"
use 'neovim/nvim-lspconfig'
use 'williamboman/nvim-lsp-installer'
use "williamboman/mason.nvim"
use "williamboman/mason-lspconfig.nvim"
use "jayp0521/mason-null-ls.nvim"
use "Hoffs/omnisharp-extended-lsp.nvim"
use({ 'scalameta/nvim-metals', requires = { "nvim-lua/plenary.nvim" } })
use "b0o/schemastore.nvim"
use "jose-elias-alvarez/null-ls.nvim"
use "lvimuser/lsp-inlayhints.nvim"
use "theHamsta/nvim-semantic-tokens"
use {

View File

@@ -45,3 +45,22 @@ vim.g.indent_blankline_show_current_context = true
indent_blankline.setup({
show_current_context = true,
})
require("colorizer").setup {
filetypes = {
'*',
html = { names = true },
css = { names = true },
},
user_default_options = {
mode = "virtualtext",
RGB = true,
RRGGBB = true,
names = false,
RRGGBBAA = true,
AARRGGBB = true,
rgb_fn = true,
hsl_fn = true,
tailwind = true,
},
}