made a new river tags widget for waybar, added C++ LSP support,
(probably need to look into LSP deeper to trim any fat)
This commit is contained in:
parent
060a6fc75f
commit
a60361b7d0
@ -1,7 +1,16 @@
|
||||
{
|
||||
"LuaSnip": { "branch": "master", "commit": "eda5be8f0ce9816278671f0b578cdbb8b762c701" },
|
||||
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
|
||||
"cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
|
||||
"cmp-path": { "branch": "main", "commit": "e52e640b7befd8113b3350f46e8cfcfe98fcf730" },
|
||||
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "140ac646db125904e456e42ab8b538d28f9607d7" },
|
||||
"kanagawa.nvim": { "branch": "master", "commit": "debe91547d7fb1eef34ce26a5106f277fbfdd109" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "c4c84f4521d62de595c0d0f718a9a40c1890c8ce" },
|
||||
"mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
|
||||
"mini.comment": { "branch": "main", "commit": "6e1f9a8ebbf6f693fa3787ceda8ca3bf3cb6aec7" },
|
||||
"mini.cursorword": { "branch": "main", "commit": "7d1b38a17834acbbc4feff8e42aedc4ed0c6ff06" },
|
||||
"mini.icons": { "branch": "main", "commit": "94848dad1589a199f876539bd79befb0c5e3abf0" },
|
||||
@ -9,6 +18,8 @@
|
||||
"mini.notify": { "branch": "main", "commit": "05e598d5b349bd66404d576e6a4d4340aea5f194" },
|
||||
"mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
|
||||
"mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "1cb30b1bafe5a63a5c6ac20dc39f83487df38855" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||
"oil.nvim": { "branch": "master", "commit": "08c2bce8b00fd780fb7999dbffdf7cd174e896fb" },
|
||||
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
||||
|
||||
9
.config/nvim/lua/config/lsp.lua
Normal file
9
.config/nvim/lua/config/lsp.lua
Normal file
@ -0,0 +1,9 @@
|
||||
-- LSP servers
|
||||
vim.lsp.enable('clangd')
|
||||
vim.lsp.enable('pyright')
|
||||
vim.lsp.enable('lua_ls')
|
||||
|
||||
-- Virtual text
|
||||
vim.diagnostic.config({
|
||||
virtual_text = true
|
||||
})
|
||||
69
.config/nvim/lua/plugins/lsp.lua
Normal file
69
.config/nvim/lua/plugins/lsp.lua
Normal file
@ -0,0 +1,69 @@
|
||||
return {
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
opts = {}
|
||||
},
|
||||
{
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
opts = {
|
||||
ensure_installed = { "lua_ls", "clangd","pyright"}
|
||||
}
|
||||
},
|
||||
{
|
||||
'hrsh7th/cmp-nvim-lsp',
|
||||
'hrsh7th/cmp-buffer',
|
||||
'hrsh7th/cmp-path',
|
||||
'hrsh7th/cmp-cmdline',
|
||||
'saadparwaiz1/cmp_luasnip',
|
||||
},
|
||||
{
|
||||
'L3MON4D3/LuaSnip',
|
||||
dependencies = { 'rafamadriz/friendly-snippets' },
|
||||
},
|
||||
{
|
||||
"neovim/nvim-lspconfig"
|
||||
},
|
||||
{
|
||||
'hrsh7th/nvim-cmp',
|
||||
config = function()
|
||||
local cmp = require('cmp')
|
||||
local cmp_select = { behavior = cmp.SelectBehavior.Select }
|
||||
cmp.setup({
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
require('luasnip').lsp_expand(args.body)
|
||||
require('luasnip.loaders.from_vscode').lazy_load()
|
||||
end,
|
||||
},
|
||||
window = {
|
||||
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
['<c-space>'] = cmp.mapping.complete(),
|
||||
['<c-n>'] = cmp.mapping.select_next_item(cmp_select),
|
||||
['<c-p>'] = cmp.mapping.select_prev_item(cmp_select),
|
||||
['<Tab>'] = cmp.mapping.confirm({ select = true }),
|
||||
}),
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'nvim_lsp' },
|
||||
})
|
||||
})
|
||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
|
||||
require("lspconfig").lua_ls.setup({
|
||||
capabilities = capabilities
|
||||
})
|
||||
|
||||
require("lspconfig").clangd.setup({
|
||||
capabilities = capabilities
|
||||
})
|
||||
require("lspconfig").pyright.setup({
|
||||
capabilities = capabilities
|
||||
})
|
||||
|
||||
end
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
# Main prompt config
|
||||
format = '$git_branch$git_status$character'
|
||||
format = '''$git_branch$git_status$character'''
|
||||
right_format = '$directory'
|
||||
add_newline = false
|
||||
right_format = '$directory$time'
|
||||
|
||||
|
||||
# Sub Configs
|
||||
[character]
|
||||
format = '$symbol '
|
||||
success_symbol = '[\$](bold green)'
|
||||
error_symbol = '[\$](bold red)'
|
||||
success_symbol = '[](bold purple)'
|
||||
error_symbol = '[](bold red)'
|
||||
|
||||
[directory]
|
||||
style='italic bright-black'
|
||||
|
||||
@ -1,21 +1,80 @@
|
||||
{
|
||||
"height": 30,
|
||||
|
||||
//
|
||||
// We'll need to make two different bars
|
||||
|
||||
"height": 15,
|
||||
"position": "top",
|
||||
|
||||
"reload-style-on-change": true,
|
||||
|
||||
// List to modify
|
||||
|
||||
"modules-left":["river/tags"],
|
||||
|
||||
// Center modules will be the workspaces
|
||||
"modules-center":["river/window"],
|
||||
"modules-right":["mpd","wireplumber","cpu","memory","temperature","disk","network","battery","tray","clock"],
|
||||
|
||||
// Rightward modules will keep track of time
|
||||
"modules-right":["clock", "tray"],
|
||||
|
||||
// River tags
|
||||
// Left modules
|
||||
"river/tags": {
|
||||
"num-tags": 7
|
||||
"num-tags": 9,
|
||||
"tag-labels": [
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
""
|
||||
]
|
||||
},
|
||||
|
||||
// Center modules
|
||||
"river/window": {
|
||||
|
||||
},
|
||||
|
||||
// Right modules
|
||||
"mpd": {
|
||||
|
||||
},
|
||||
|
||||
"wireplumber": {
|
||||
|
||||
},
|
||||
|
||||
"cpu": {
|
||||
|
||||
},
|
||||
|
||||
"memory": {
|
||||
|
||||
},
|
||||
|
||||
"temperature": {
|
||||
|
||||
},
|
||||
|
||||
"disk": {
|
||||
|
||||
},
|
||||
|
||||
"network":{
|
||||
|
||||
},
|
||||
|
||||
"battery": {
|
||||
|
||||
},
|
||||
|
||||
"tray": {
|
||||
|
||||
},
|
||||
|
||||
"clock": {
|
||||
"format": "{:%OI:%M %p}"
|
||||
}
|
||||
|
||||
// River window (left unset for now)
|
||||
|
||||
// Tray
|
||||
// Any custom modules go below here
|
||||
}
|
||||
|
||||
@ -1,48 +1,55 @@
|
||||
|
||||
/* All things related to the bar itself */
|
||||
/* Some universal settings for the elements*/
|
||||
* {
|
||||
font-family: "FiraCode Nerd Font";
|
||||
font-size: 14px;
|
||||
border-radius: 0;
|
||||
font-size: 17px;
|
||||
border-radius: 20px;
|
||||
min-height: 0;
|
||||
border: none;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
/*
|
||||
* We want the bar itself to be a "support" for the floating elements
|
||||
* Therefore, we want the base bar to be transparent,
|
||||
* so that the elements seem to float by themselves
|
||||
* */
|
||||
#waybar {
|
||||
background-color: rgba(0,0,0,0);
|
||||
transition-property: background-color;
|
||||
transition-duration: 0.7s;
|
||||
}
|
||||
|
||||
|
||||
#waybar.hidden {
|
||||
opacity: 0.5;
|
||||
}
|
||||
/* Tags */
|
||||
|
||||
#window,
|
||||
#clock,
|
||||
#tray,
|
||||
/* On the tag object tags */
|
||||
#tags {
|
||||
border-radius: 21px;
|
||||
padding: 7px 7px;
|
||||
margin: 7px 3px 7px;
|
||||
background-color: #1e1e2e;
|
||||
color: #181825;
|
||||
background-color: #1f1f28;
|
||||
margin: 7px;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
/* On empty tags*/
|
||||
#tags button {
|
||||
border-radius: 21px;
|
||||
|
||||
color: #363646;
|
||||
}
|
||||
|
||||
|
||||
/* On occupied tags */
|
||||
#tags button.occupied {
|
||||
color: #dcd7ba;
|
||||
}
|
||||
|
||||
/* On focused tags */
|
||||
#tags button.focused {
|
||||
background-color: #4e4e6e;
|
||||
}
|
||||
|
||||
#window {
|
||||
color: #656565;
|
||||
color: #1f1f28;
|
||||
background-color: #dcd7ba;
|
||||
border-radius: 20px;
|
||||
}
|
||||
|
||||
|
||||
/* On urgent tags */
|
||||
#tags button.urgent {
|
||||
|
||||
}
|
||||
|
||||
/* Window Name */
|
||||
|
||||
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@ -7,3 +7,5 @@
|
||||
.config/pulse
|
||||
.config/qutebrowser
|
||||
.config/unity3d
|
||||
.config/borgmatic
|
||||
.config/WebCord
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user