Small changes to waybar, nvim conf update

TODO: rewrite nvim configs to lua
This commit is contained in:
2024-04-22 15:29:14 +02:00
parent 2e9e6dc76f
commit 8412e10239
3 changed files with 37 additions and 8 deletions

View File

@@ -82,14 +82,16 @@ Plug 'ms-jpq/coq.thirdparty', {'branch': '3p'}
Plug 'nvim-tree/nvim-web-devicons' Plug 'nvim-tree/nvim-web-devicons'
Plug 'projekt0n/circles.nvim' Plug 'projekt0n/circles.nvim'
Plug 'uga-rosa/translate.nvim' Plug 'nvim-neotest/nvim-nio'
Plug 'uga-rosa/translate.nvim'
Plug 'mechatroner/rainbow_csv'
Plug 'christoomey/vim-system-copy' Plug 'christoomey/vim-system-copy'
Plug 'eandrju/cellular-automaton.nvim' Plug 'eandrju/cellular-automaton.nvim'
Plug 'williamboman/mason.nvim' Plug 'williamboman/mason.nvim'
Plug 'williamboman/mason-lspconfig.nvim' Plug 'williamboman/mason-lspconfig.nvim'
Plug 'neovim/nvim-lspconfig' Plug 'neovim/nvim-lspconfig'
Plug 'ranjithshegde/ccls.nvim' "Plug 'ranjithshegde/ccls.nvim'
Plug 'mfussenegger/nvim-dap' Plug 'mfussenegger/nvim-dap'
Plug 'rcarriga/nvim-dap-ui' Plug 'rcarriga/nvim-dap-ui'
" Initialize plugin system " Initialize plugin system
@@ -134,7 +136,7 @@ let g:syntastic_python_checkers = ['bandit', 'python']
" Keybinds " Keybinds
nnoremap <F2> :CHADopen<CR> nnoremap <F2> :CHADopen<CR>
set pastetoggle=<F3> nnoremap <F3> :lua vim.lsp.buf.code_action()<CR>
nnoremap <F4> :Goyo<CR> nnoremap <F4> :Goyo<CR>
nnoremap <F5> :MundoToggle<CR> nnoremap <F5> :MundoToggle<CR>
nnoremap <F6> :lua require("dapui").toggle()<CR> nnoremap <F6> :lua require("dapui").toggle()<CR>
@@ -147,11 +149,31 @@ nnoremap <F6> :lua require("dapui").toggle()<CR>
lua << EOF lua << EOF
require("mason").setup() require("mason").setup()
require("mason-lspconfig").setup() require("mason-lspconfig").setup()
require("mason-lspconfig").setup_handlers({
function (server_name) -- default handler (optional)
require("lspconfig")[server_name].setup(require('coq').lsp_ensure_capabilities({}))
end})
local lsp = require "lspconfig" local lsp = require "lspconfig"
local coq = require "coq" -- add this local coq = require "coq" -- add this
local dap = require("dap")
dap.adapters.gdb = {
type = "executable",
command = "gdb",
args = { "-i", "dap" }
}
dap.configurations.cpp = {
{
name = "Launch",
type = "gdb",
request = "launch",
program = function()
return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
end,
cwd = "${workspaceFolder}",
stopAtBeginningOfMainSubprogram = false,
},
}
-- Mappings. -- Mappings.
-- See `:help vim.diagnostic.*` for documentation on any of the below functions -- See `:help vim.diagnostic.*` for documentation on any of the below functions
local opts = { noremap=true, silent=true } local opts = { noremap=true, silent=true }
@@ -194,8 +216,9 @@ local lsp_flags = {
--lsp.<server>.setup(<stuff...>) -- before --lsp.<server>.setup(<stuff...>) -- before
--lsp.<server>.setup(coq.lsp_ensure_capabilities(<stuff...>)) -- after --lsp.<server>.setup(coq.lsp_ensure_capabilities(<stuff...>)) -- after
lsp.pyright.setup(coq.lsp_ensure_capabilities({})) --lsp.pyright.setup(coq.lsp_ensure_capabilities({}))
lsp.ccls.setup(coq.lsp_ensure_capabilities({})) --lsp.ccls.setup(coq.lsp_ensure_capabilities({}))
--lsp.ltex.setup(coq.lsp_ensure_capabilities({settings = {ltex = {language = "pl-PL"}}}))
lsp.rust_analyzer.setup(coq.lsp_ensure_capabilities({ lsp.rust_analyzer.setup(coq.lsp_ensure_capabilities({
settings = { settings = {
["rust-analyzer"] = { ["rust-analyzer"] = {

View File

@@ -28,6 +28,8 @@
"hyprland/workspaces":{ "hyprland/workspaces":{
"active-only":false, "active-only":false,
"format":"{name}", "format":"{name}",
"on-scroll-up": "hyprctl dispatch workspace e+1",
"on-scroll-down": "hyprctl dispatch workspace e-1",
"persistent-workspaces": { "persistent-workspaces": {
"*":10, "*":10,
}, },

View File

@@ -50,10 +50,14 @@ button:hover {
#workspaces button { #workspaces button {
padding: 0 5px; padding: 0 5px;
background-color: transparent; background-color: shade(@blue, 0.5);
color: #ffffff; color: #ffffff;
} }
#workspaces button.empty {
background-color: transparent;/* rgba(43, 48, 59, 0.5);*/
}
#workspaces button:hover { #workspaces button:hover {
background: rgba(0, 0, 0, 0.2); background: rgba(0, 0, 0, 0.2);
} }