Skip to content

Commit f0db555

Browse files
committed
Update some configs
1 parent 64e1e55 commit f0db555

File tree

7 files changed

+175
-128
lines changed

7 files changed

+175
-128
lines changed

lazygit/config.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
11
gui:
2-
showIcons: true
2+
nerdFontsVersion: "3"
3+
4+
customCommands:
5+
- key: F
6+
context: remoteBranches
7+
command: git fetch --prune
8+
description: Remove remote tracking branches that no longer exist remotely
9+
loadingText: Pruning remote tracking branches...
10+
stream: true

nvim/init.vim

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Plug 'nvim-lualine/lualine.nvim' " Statusline
2323
Plug 'folke/trouble.nvim' " Lists GUI
2424
Plug 'SmiteshP/nvim-navic' " Dependency of barbecue.nvim
2525
Plug 'utilyre/barbecue.nvim' " Winbar
26+
Plug 'stevearc/dressing.nvim' " Improve the default vim.ui interfaces
2627

2728
" Navigation
2829
Plug 'christoomey/vim-tmux-navigator' " Tmux integration
@@ -65,16 +66,18 @@ Plug 'saadparwaiz1/cmp_luasnip' " Snippet completion source for nvim-cmp
6566
Plug 'onsails/lspkind-nvim' " Icons for LSP completion items
6667

6768
" Language-specific tools
68-
" Plug 'cdelledonne/vim-cmake' " CMake projects
69+
Plug 'cdelledonne/vim-cmake' " CMake projects
6970
Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app && yarn install' }
7071
" Markdown preview
7172

7273
" Project configuration
7374
Plug 'tpope/vim-obsession' " Session manager
7475
Plug 'embear/vim-localvimrc' " Local project options
7576

77+
Plug 'danymat/neogen'
78+
7679
" Local plugins
77-
Plug '~/Workspace/Repositories/cdelledonne/vim-cmake'
80+
" Plug '~/Workspace/Repositories/cdelledonne/vim-cmake'
7881

7982
call plug#end()
8083

@@ -104,6 +107,7 @@ lua require('plugins/barbecue-init')
104107
lua require('plugins/indent-blankline-init')
105108
lua require('plugins/lualine-init')
106109
lua require('plugins/luasnip-init')
110+
lua require('plugins/neogen-init')
107111
lua require('plugins/nvim-cmp-init')
108112
lua require('plugins/nvim-dap-init')
109113
lua require('plugins/nvim-lspconfig-init')
@@ -116,4 +120,5 @@ lua require('plugins/trouble-init')
116120
" Lua config-less plugins
117121
lua require('Comment').setup()
118122
lua require('diffview').setup()
123+
lua require('dressing').setup()
119124
lua require('nvim-autopairs').setup()

nvim/lua/plugins/lsp-servers.lua

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ local on_attach = function(client, bufnr)
1616
buf_set_keymap("n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts)
1717
buf_set_keymap("n", "<leader>td", "<cmd>lua vim.lsp.buf.type_definition()<CR>", opts)
1818
buf_set_keymap("n", "<leader>fm", "<cmd>lua vim.lsp.buf.format()<CR>", opts)
19-
19+
buf_set_keymap("n", "<leader>ca", "<cmd>lua vim.lsp.buf.code_action()<CR>", opts)
2020
buf_set_keymap("n", "K", "<cmd>lua vim.lsp.buf.hover()<CR>", opts)
2121
buf_set_keymap("n", "[d", "<cmd>lua vim.diagnostic.goto_prev()<CR>", opts)
2222
buf_set_keymap("n", "]d", "<cmd>lua vim.diagnostic.goto_next()<CR>", opts)
@@ -27,25 +27,20 @@ end
2727
local capabilities = vim.lsp.protocol.make_client_capabilities()
2828
capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities)
2929

30-
-- C/C++ language server with ccls
31-
-- lspconfig.ccls.setup({
32-
-- cmd = { "ccls", "-v=1", "-log-file=/tmp/ccls.log" },
33-
-- init_options = {
34-
-- cache = { directory = "/tmp/ccls" },
35-
-- clang = { extraArgs = { "-Wno-extra", "-Wno-empty-body" } },
36-
-- client = { snippetSupport = true },
37-
-- completion = { detailedLabel = false, caseSensitivity = 1 },
38-
-- highlight = { lsRanges = true },
39-
-- },
40-
-- on_attach = on_attach,
41-
-- capabilities = capabilities,
42-
-- })
43-
4430
-- C/C++ language server with clangd
4531
lspconfig.clangd.setup({
4632
cmd = { "clangd" },
4733
on_attach = on_attach,
4834
capabilities = capabilities,
35+
on_new_config = function(config, root_dir)
36+
if vim.g.clangd_query_driver ~= nil then
37+
config.cmd = {
38+
"clangd",
39+
"--query-driver",
40+
vim.g.clangd_query_driver,
41+
}
42+
end
43+
end
4944
})
5045

5146
-- Python language server

nvim/lua/plugins/neogen-init.lua

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
local neogen = require("neogen")
2+
3+
local i = require("neogen.types.template").item
4+
annotation = {
5+
{ nil, "///", { no_results = true, type = { "func", "file", "class" } } },
6+
{ nil, "/// @file", { no_results = true, type = { "file" } } },
7+
{ nil, "/// @brief $1", { no_results = true, type = { "func", "file", "class" } } },
8+
{ nil, "///", { no_results = true, type = { "func", "file", "class" } } },
9+
{ nil, "", { no_results = true, type = { "file" } } },
10+
11+
{ nil, "///", { type = { "func", "class", "type" } } },
12+
{ i.ClassName, "/// @class %s", { type = { "class" } } },
13+
{ i.Type, "/// @typedef %s", { type = { "type" } } },
14+
{ nil, "/// @brief $1", { type = { "func", "class", "type" } } },
15+
{ nil, "///", { type = { "func", "class", "type" } } },
16+
{ i.Tparam, "/// @tparam %s $1" },
17+
{ i.Parameter, "/// @param %s $1" },
18+
{ i.Return, "/// @return $1" },
19+
{ nil, "///", { type = { "func", "class", "type" } } },
20+
}
21+
22+
neogen.setup({
23+
snippet_engine = "luasnip",
24+
languages = {
25+
cpp = {
26+
template = {
27+
annotation_convention = "doxygen_custom",
28+
doxygen_custom = annotation,
29+
},
30+
},
31+
},
32+
})

nvim/lua/plugins/nvim-treesitter-init.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ treesitter.setup({
55

66
ensure_installed = {
77
"bash", "bibtex", "c", "cmake", "comment", "cpp", "css", "dockerfile",
8-
"go", "html", "java", "javascript", "json", "json5", "jsonc", "latex",
9-
"llvm", "lua", "make", "markdown", "markdown_inline", "ninja", "perl",
10-
"php", "python", "regex", "rst", "ruby", "rust", "toml", "typescript",
11-
"verilog", "vim", "yaml",
8+
"doxygen", "go", "html", "java", "javascript", "json", "json5",
9+
"jsonc", "latex", "llvm", "lua", "make", "markdown", "markdown_inline",
10+
"ninja", "perl", "php", "python", "regex", "rst", "ruby", "rust",
11+
"toml", "typescript", "verilog", "vim", "yaml",
1212
},
1313

1414
highlight = {

nvim/spell/en.utf-8.add

Lines changed: 113 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -1,124 +1,131 @@
1-
backscatter
2-
intermittency
3-
microcontrollers
4-
scalable
5-
remanence
6-
WSN
7-
#PCs
8-
microcontroller
9-
checkpointing
10-
downscaling
11-
runtime
12-
virtualization
13-
parametrize
14-
atomicity
15-
metadata
16-
checkmark
17-
submultiple
18-
et al.
19-
timestamp
20-
datasheet
21-
goodput
22-
comparator
23-
batteryless
24-
Capacitive
25-
capacitive
26-
MCU
27-
RTC
28-
priori
29-
SRAM
30-
RFID
31-
et alia
32-
transduce
33-
outliers
34-
interferences
35-
mentorship
36-
SPI
37-
printf
38-
HALCoGen
39-
MHP
1+
A9
402
ADwin
3+
AE
4+
API
5+
ASIC
6+
Afi
7+
Afi's
8+
Avnet's
9+
BQC
10+
CMake
11+
CNetwork
12+
CRC
13+
Capacitive
14+
Dahlberg
4115
EGP
16+
EGP's
4217
EPR
43-
TCP
44-
UDP
45-
qubit
46-
QDriver
47-
CRC
48-
qubits
49-
QuTech
50-
QDevice
51-
QNodeOS
52-
microarchitecture
53-
microarchitectures
54-
Neovim
55-
macOS
56-
Vimscript
57-
CMake
58-
TODO
59-
Xilinx
18+
Edoardo
19+
FPGA
20+
FreeRTOS
21+
Gigabit
22+
HALCoGen
23+
MCU
24+
MHP
6025
MicroZed
61-
Zynq
62-
Vivado
63-
Vitis
64-
QMMU
65-
QIA
26+
MicroZed's
27+
NISQ
6628
NV
67-
preemption
68-
preempted
69-
decoherence
70-
Vergilius
71-
README
29+
Neovim
7230
NetQASM
73-
CNetwork
74-
Edoardo
75-
Prioritization
76-
prioritization
77-
SoC
78-
API
79-
QDevices
80-
SDK
81-
QASM
82-
i.e.
83-
QPU
84-
ProcMgr
85-
Dahlberg
8631
OSI
87-
QNetwork
88-
teleportation
89-
AE
90-
deregister
32+
PCs
9133
Podolsky
92-
QNetStack
93-
QNodeOS's
34+
Prioritization
35+
ProcMgr
36+
Przemek
37+
QASM
38+
QDevice
9439
QDevice's
95-
FreeRTOS
96-
toolchain
40+
QDevices
41+
QDriver
42+
QEGP
43+
QIA
44+
QKD
45+
QMMU
9746
QNP
9847
QNP's
99-
EGP's
100-
Avnet's
101-
A9
102-
MicroZed's
103-
Gigabit
104-
offline
105-
BQC
106-
VBQC
107-
NISQ
108-
QEGP
109-
latencies
110-
TDMA
111-
fidelities
112-
SDN
11348
QNPU
114-
QKD
115-
FPGA
116-
ASIC
49+
QNetStack
50+
QNetwork
51+
QNodeOS
52+
QNodeOS's
53+
QPU
54+
QuTech
55+
README
56+
RFID
57+
RTC
11758
RTOS
59+
RTT
60+
SDK
61+
SDN
62+
SEGGER
63+
SEGGER's
64+
SPI
65+
SRAM
66+
SoC
67+
SystemView
68+
TCP
69+
TDMA
70+
TODO
71+
UDP
72+
VBQC
73+
Vergilius
74+
Vimscript
75+
Vitis
76+
Vivado
77+
WSN
78+
Xilinx
79+
Zynq
80+
atomicity
81+
backscatter
82+
batteryless
83+
capacitive
84+
checkmark
85+
checkpointing
86+
comparator
87+
datasheet
88+
decoherence
11889
dephasing
90+
deregister
91+
downscaling
92+
et al.
93+
et alia
94+
fidelities
95+
goodput
96+
i.e.
97+
interferences
98+
intermittency
11999
jitter
120-
Przemek
100+
latencies
101+
macOS
102+
mentorship
103+
metadata
104+
microarchitecture
105+
microarchitectures
106+
microcontroller
107+
microcontrollers
108+
offline
109+
outliers
110+
parametrize
121111
photonic
122-
scalability
112+
preempted
113+
preemption
114+
printf
115+
priori
116+
prioritization
123117
programmability
118+
qubit
119+
qubits
120+
remanence
121+
runtime
124122
résumé
123+
scalability
124+
scalable
125+
submodule
126+
submultiple
127+
teleportation
128+
timestamp
129+
toolchain
130+
transduce
131+
virtualization

nvim/spell/en.utf-8.add.spl

93 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)