Resolve merge conflicts
Test Neovim config on push / build (ubuntu-20.04) (push) Has been cancelled
Details
Test Neovim config on push / build (ubuntu-20.04) (push) Has been cancelled
Details
This commit is contained in:
commit
437ce3ff2e
|
@ -1,3 +1,6 @@
|
||||||
lastSession.vim
|
lastSession.vim
|
||||||
plugin/
|
plugin/
|
||||||
spell/
|
spell/
|
||||||
|
./mail_password
|
||||||
|
./lua/irc.lua
|
||||||
|
./lazy-lock.json
|
||||||
|
|
|
@ -36,15 +36,15 @@ def find_candidate(tabstop, search_type):
|
||||||
endglobal
|
endglobal
|
||||||
|
|
||||||
snippet helloworld "Hello world example to test features" b
|
snippet helloworld "Hello world example to test features" b
|
||||||
-- `!p snip.rv = fn`
|
-- `!p snip.rv = fn`
|
||||||
-- Created on: `date`
|
-- Created on: `date`
|
||||||
-- Author(s): Yannick Reiss <yannick.reiss@nickr.eu>
|
-- Author(s): Yannick Reiss <yannick.reiss@nickr.eu>
|
||||||
-- Content: Hello world example
|
-- Content: Hello world example
|
||||||
with Ada.Text_IO; use Ada.Text_IO;
|
with Ada.Text_IO; use Ada.Text_IO;
|
||||||
|
|
||||||
-- @name ${1:`!p snip.rv = fn[0].upper() + fn[1:].split('.')[0]`}
|
-- @name ${1:`!p snip.rv = fn[0].upper() + fn[1:].split('.')[0]`}
|
||||||
-- @return
|
-- @return
|
||||||
-- @description Function printing hello world.
|
-- @description Function printing hello world.
|
||||||
procedure $1 is
|
procedure $1 is
|
||||||
|
|
||||||
begin
|
begin
|
||||||
|
@ -53,16 +53,16 @@ end $1;$0
|
||||||
endsnippet
|
endsnippet
|
||||||
|
|
||||||
snippet docstring "Document String with most important information" b
|
snippet docstring "Document String with most important information" b
|
||||||
-- `!p snip.rv = fn`
|
-- `!p snip.rv = fn`
|
||||||
-- Created on: `date`
|
-- Created on: `date`
|
||||||
-- Author(s): ${1:Yannick Reiß}
|
-- Author(s): ${1:Yannick Reiß}
|
||||||
-- Description: ${2:`!p snip.rv = fn.split('.')[0]`}
|
-- Description: ${2:`!p snip.rv = fn.split('.')[0]`}
|
||||||
$0
|
$0
|
||||||
endsnippet
|
endsnippet
|
||||||
|
|
||||||
snippet procedure "insert procedure" b
|
snippet procedure "insert procedure" b
|
||||||
-- @name $1
|
-- @name $1
|
||||||
-- @return
|
-- @return
|
||||||
`!p
|
`!p
|
||||||
snip.rv = ""
|
snip.rv = ""
|
||||||
if t[2].startswith("l"):
|
if t[2].startswith("l"):
|
||||||
|
@ -95,8 +95,8 @@ else:
|
||||||
for variable in variables:
|
for variable in variables:
|
||||||
if not variable == "" and not variable.startswith("typ"):
|
if not variable == "" and not variable.startswith("typ"):
|
||||||
variableless = variable.replace("\t", "").replace (" ", "")
|
variableless = variable.replace("\t", "").replace (" ", "")
|
||||||
snip.rv += f"-- @variable {variableless}\n"
|
snip.rv += f"\t-- @variable {variableless}\n"
|
||||||
`-- @description $4
|
`-- @description $4
|
||||||
procedure ${1:`!p snip.rv = fn.split('.')[0].capitalize()`} `!p snip.rv = "" if t[2] == "" else "("`${2:N : Natural}`!p snip.rv = "" if t[2] == "" else ")"` is
|
procedure ${1:`!p snip.rv = fn.split('.')[0].capitalize()`} `!p snip.rv = "" if t[2] == "" else "("`${2:N : Natural}`!p snip.rv = "" if t[2] == "" else ")"` is
|
||||||
$3
|
$3
|
||||||
begin
|
begin
|
||||||
|
@ -105,8 +105,8 @@ end $1;$0
|
||||||
endsnippet
|
endsnippet
|
||||||
|
|
||||||
snippet function "insert function" b
|
snippet function "insert function" b
|
||||||
-- @name $1
|
-- @name $1
|
||||||
-- @return $3
|
-- @return $3
|
||||||
`!p
|
`!p
|
||||||
snip.rv = ""
|
snip.rv = ""
|
||||||
if t[2].startswith("l"):
|
if t[2].startswith("l"):
|
||||||
|
@ -129,7 +129,7 @@ for parameter in parameters:
|
||||||
for parameter in parameter_list:
|
for parameter in parameter_list:
|
||||||
if not parameter == "" and not parameter.startswith("typ"):
|
if not parameter == "" and not parameter.startswith("typ"):
|
||||||
parameterless = parameter.replace("\t", "")
|
parameterless = parameter.replace("\t", "")
|
||||||
snip.rv += f"-- @parameter {parameterless}\n"
|
snip.rv += f"\t-- @parameter {parameterless}\n"
|
||||||
``!p
|
``!p
|
||||||
snip.rv = ""
|
snip.rv = ""
|
||||||
if t[4].startswith("l"):
|
if t[4].startswith("l"):
|
||||||
|
@ -139,7 +139,7 @@ else:
|
||||||
for variable in variables:
|
for variable in variables:
|
||||||
if not variable == "" and not variable.startswith("typ") and not variable.startswith("--"):
|
if not variable == "" and not variable.startswith("typ") and not variable.startswith("--"):
|
||||||
variableless = variable.replace("\t", "").replace (" ", "")
|
variableless = variable.replace("\t", "").replace (" ", "")
|
||||||
snip.rv += f"-- @variable {variableless}\n"
|
snip.rv += f"\t-- @variable {variableless}\n"
|
||||||
` -- @description $5
|
` -- @description $5
|
||||||
function ${1:`!p snip.rv = fn.split('.')[0].capitalize()`} `!p snip.rv = "" if t[2] == "" else "("`${2:N : Natural}`!p snip.rv = "" if t[2] == "" else ")"` return ${3:Natural} is
|
function ${1:`!p snip.rv = fn.split('.')[0].capitalize()`} `!p snip.rv = "" if t[2] == "" else "("`${2:N : Natural}`!p snip.rv = "" if t[2] == "" else ")"` return ${3:Natural} is
|
||||||
$4
|
$4
|
||||||
|
@ -178,7 +178,7 @@ project ${1:Default} is
|
||||||
for Main use ("${5:main.adb}");
|
for Main use ("${5:main.adb}");
|
||||||
for Languages use ("Ada");
|
for Languages use ("Ada");
|
||||||
end $1;
|
end $1;
|
||||||
-- Create dir? (y/): ${6:no}`!p
|
-- Create dir? (y/): ${6:no}`!p
|
||||||
from os import system
|
from os import system
|
||||||
if t[6] == "y":
|
if t[6] == "y":
|
||||||
system(f"mkdir -p {t[2]}")
|
system(f"mkdir -p {t[2]}")
|
||||||
|
@ -187,7 +187,8 @@ if t[6] == "y":
|
||||||
endsnippet
|
endsnippet
|
||||||
|
|
||||||
snippet package "Create package configuration" b
|
snippet package "Create package configuration" b
|
||||||
package ${1:body }${2:`!p snip.rv = fn.split('.')[0]`} is
|
package ${1:body }${2:`!p package_name = fn.split('.')[0]
|
||||||
|
snip.rv = package_name[0].upper() + package_name[1:]`} is
|
||||||
$0
|
$0
|
||||||
end $2;
|
end $2;
|
||||||
endsnippet
|
endsnippet
|
||||||
|
|
|
@ -2,8 +2,8 @@ snippet dd "Date and Time" i
|
||||||
`date`
|
`date`
|
||||||
endsnippet
|
endsnippet
|
||||||
|
|
||||||
snippet cred "My private Credentials"
|
snippet crednick "My private Credentials"
|
||||||
Nicki Reiss <yannick.reiss@nickr.eu>
|
Yannick Reiss <yannick.reiss@nickr.eu>
|
||||||
endsnippet
|
endsnippet
|
||||||
|
|
||||||
snippet credhsrm "Credentials HSRM"
|
snippet credhsrm "Credentials HSRM"
|
||||||
|
@ -45,3 +45,11 @@ ${9:Message}
|
||||||
|
|
||||||
${10:`cat ~/.signature.txt`}
|
${10:`cat ~/.signature.txt`}
|
||||||
endsnippet
|
endsnippet
|
||||||
|
|
||||||
|
snippet crednina "My true credentials"
|
||||||
|
Nina Chloé Kassandra Reiß <nina.reiss@nickr.eu>
|
||||||
|
endsnippet
|
||||||
|
|
||||||
|
snippet pwd "Print the current working directory"
|
||||||
|
`echo $(pwd)`
|
||||||
|
endsnippet
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
snippet ff "Freunde (fast)" A
|
||||||
|
.freunde
|
||||||
|
endsnippet
|
||||||
|
|
||||||
|
snippet wild "Widi Schild update"
|
||||||
|
widi: Schildupdate?
|
||||||
|
endsnippet
|
|
@ -52,3 +52,17 @@ endsnippet
|
||||||
snippet ,m "Math equation" A
|
snippet ,m "Math equation" A
|
||||||
\$$1\$ $0
|
\$$1\$ $0
|
||||||
endsnippet
|
endsnippet
|
||||||
|
|
||||||
|
snippet bookshelf "Tagline for bookshelf" b
|
||||||
|
`!p
|
||||||
|
if t[1] != "":
|
||||||
|
snip.rv = "[CW: "
|
||||||
|
else:
|
||||||
|
snip.rv = ""`$1`!p
|
||||||
|
if t[1] != "":
|
||||||
|
snip.rv = "]"
|
||||||
|
else:
|
||||||
|
snip.rv = ""`
|
||||||
|
${2:Title} by ${3:Author}
|
||||||
|
${4:Description}
|
||||||
|
endsnippet
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
global !p
|
||||||
|
|
||||||
|
def print_hello():
|
||||||
|
print("Hello")
|
||||||
|
|
||||||
|
endglobal
|
|
@ -11,7 +11,7 @@ if __name__ == "__main__":
|
||||||
$0
|
$0
|
||||||
endsnippet
|
endsnippet
|
||||||
|
|
||||||
snippet docmodule "Documentation for modules" A
|
snippet docmodule "Documentation for modules"
|
||||||
"""
|
"""
|
||||||
File: `!p snip.rv = fn`
|
File: `!p snip.rv = fn`
|
||||||
Author: ${1:Yannick Reiß}
|
Author: ${1:Yannick Reiß}
|
||||||
|
@ -21,7 +21,7 @@ Description: ${2:No further description}
|
||||||
$0
|
$0
|
||||||
endsnippet
|
endsnippet
|
||||||
|
|
||||||
snippet def "Python Function" A
|
snippet def "Python Function"
|
||||||
def ${1:function}(${2}):
|
def ${1:function}(${2}):
|
||||||
"""
|
"""
|
||||||
@name $1
|
@name $1
|
||||||
|
@ -35,12 +35,12 @@ for param in params:
|
||||||
snip.rv += f"\t\t@param {param}\n"
|
snip.rv += f"\t\t@param {param}\n"
|
||||||
`
|
`
|
||||||
Returns:
|
Returns:
|
||||||
$4
|
@return $4
|
||||||
"""
|
"""
|
||||||
$5
|
$5
|
||||||
`!p
|
`!p
|
||||||
if t[4] != "":
|
if t[4] != "" and len(t[4].split(":")) > 1:
|
||||||
snip.rv = f"\n return {t[4]}"`
|
snip.rv = f"return {t[4].split(':')[0]}"`
|
||||||
|
|
||||||
$0
|
$0
|
||||||
endsnippet
|
endsnippet
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
extends pyenv
|
||||||
|
|
||||||
snippet cc "Add Citation" i
|
snippet cc "Add Citation" i
|
||||||
\\cite{$1}$0
|
\\cite{$1}$0
|
||||||
endsnippet
|
endsnippet
|
||||||
|
|
|
@ -61,3 +61,7 @@ snippet def "Definition/Constant" b
|
||||||
\`define ${1:NAME} ${2:VALUE}
|
\`define ${1:NAME} ${2:VALUE}
|
||||||
$0
|
$0
|
||||||
endsnippet
|
endsnippet
|
||||||
|
|
||||||
|
snippet filename "Get Filename" b
|
||||||
|
// `pwd`/`!p snip.rv = fn`
|
||||||
|
endsnippet
|
||||||
|
|
|
@ -49,7 +49,7 @@ endsnippet
|
||||||
snippet docstring "Header Comment" A
|
snippet docstring "Header Comment" A
|
||||||
-- `!p snip.rv = fn`
|
-- `!p snip.rv = fn`
|
||||||
-- Created on: `date`
|
-- Created on: `date`
|
||||||
-- Author(s): ${1:Alexander Graf, Carl Ries, Yannick Reiß}
|
-- Author(s): ${1:Nina Chloé Reiß}
|
||||||
-- Content: ${2: Entity `!p snip.rv = fn.split('.')[0]`}
|
-- Content: ${2: Entity `!p snip.rv = fn.split('.')[0]`}
|
||||||
$0
|
$0
|
||||||
endsnippet
|
endsnippet
|
||||||
|
|
|
@ -1,51 +0,0 @@
|
||||||
{
|
|
||||||
"UltiSnips": { "branch": "master", "commit": "49dc8cb2086db19d385791c8e1635723b0fd95c7" },
|
|
||||||
"barbar.nvim": { "branch": "master", "commit": "3c48b5edf61dda21ad41c514e53448fee366a824" },
|
|
||||||
"bufstop": { "branch": "master", "commit": "274fc0e9fd6e8de860c427860c1e9970df142df5" },
|
|
||||||
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
|
||||||
"cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" },
|
|
||||||
"cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
|
|
||||||
"cmp-cmdline-history": { "branch": "master", "commit": "003573b72d4635ce636234a826fa8c4ba2895ffe" },
|
|
||||||
"cmp-fuzzy-buffer": { "branch": "main", "commit": "ada6352bc7e3c32471ab6c08f954001870329de1" },
|
|
||||||
"cmp-git": { "branch": "main", "commit": "8d8993680d627c8f13bd85094eba84604107dbdd" },
|
|
||||||
"cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
|
|
||||||
"cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
|
|
||||||
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
|
|
||||||
"cmp-nvim-ultisnips": { "branch": "main", "commit": "24bca5c3e137b28cd87442d4fc51a2b312dd99cc" },
|
|
||||||
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
|
||||||
"cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" },
|
|
||||||
"cyberspace.vim": { "branch": "master", "commit": "8d002ef6a449f08025d75249078ecae75a136a2d" },
|
|
||||||
"formatter.nvim": { "branch": "master", "commit": "ad246d34ce7a32f752071ed81b09b94e6b127fad" },
|
|
||||||
"fuzzy.nvim": { "branch": "master", "commit": "67a42ad2fa6d5ff41f0ef3cf69bb247410da5d7a" },
|
|
||||||
"git-blame.nvim": { "branch": "master", "commit": "a0282d05adbee80aaf4e2ff35b81b52940b67bed" },
|
|
||||||
"indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
|
|
||||||
"lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" },
|
|
||||||
"lexima.vim": { "branch": "master", "commit": "5513d686801993b40c55baa65602f79cd3cf3c77" },
|
|
||||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "82c7cb08ddb836ad938b2708e50085f12a8825d2" },
|
|
||||||
"mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" },
|
|
||||||
"nerdtree": { "branch": "master", "commit": "f3a4d8eaa8ac10305e3d53851c976756ea9dc8e8" },
|
|
||||||
"nerdtree-git-plugin": { "branch": "master", "commit": "e1fe727127a813095854a5b063c15e955a77eafb" },
|
|
||||||
"nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
|
|
||||||
"nvim-cmp-lua-latex-symbols": { "branch": "master", "commit": "89345d6e333c700d13748e8a7ee6fe57279b7f88" },
|
|
||||||
"nvim-dap": { "branch": "master", "commit": "c1695e500c7d552a0a19953a9aefcc89178fb1af" },
|
|
||||||
"nvim-doxyscan": { "branch": "master", "commit": "2c266fdb9395d6afa5d7188f8212fd7757193990" },
|
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "8c1831817d40925d22cd8a555296c44c02fdaaf5" },
|
|
||||||
"nvim-sourcer": { "branch": "main", "commit": "a2f6bc737a63a208d39fcc5c211076ea5aa9f390" },
|
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "2014f8285e306f4c8a896c7d3af53fdd599e5a4f" },
|
|
||||||
"nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" },
|
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "cb0c967c9723a76ccb1be0cc3a9a10e577d2f6ec" },
|
|
||||||
"plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" },
|
|
||||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
|
|
||||||
"telescope-ultisnips.nvim": { "branch": "main", "commit": "d1cca4b5aa809a90b7a8caddeb860329d5a8c2ff" },
|
|
||||||
"telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
|
|
||||||
"tokyonight.nvim": { "branch": "main", "commit": "c025baf23b62f044eff1f4ef561c45de636f0e32" },
|
|
||||||
"vim-airline": { "branch": "master", "commit": "d9f42cb46710e31962a9609939ddfeb0685dd779" },
|
|
||||||
"vim-airline-themes": { "branch": "master", "commit": "a9aa25ce323b2dd04a52706f4d1b044f4feb7617" },
|
|
||||||
"vim-devicons": { "branch": "master", "commit": "71f239af28b7214eebb60d4ea5bd040291fb7e33" },
|
|
||||||
"vim-monokai-tasty": { "branch": "master", "commit": "57c67feac63158a232c43aee2f463a994029b699" },
|
|
||||||
"vim-speeddating": { "branch": "master", "commit": "5a36fd29df63ea3f65562bd2bb837be48a5ec90b" },
|
|
||||||
"vim-startify": { "branch": "master", "commit": "4e089dffdad46f3f5593f34362d530e8fe823dcf" },
|
|
||||||
"vim-startuptime": { "branch": "master", "commit": "ac2cccb5be617672add1f4f3c0a55ce99ba34e01" },
|
|
||||||
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
|
|
||||||
"vim-visual-multi": { "branch": "master", "commit": "fe1ec7e430013b83c8c2dee85ae496251b71e253" }
|
|
||||||
}
|
|
|
@ -3,6 +3,41 @@ if vim == nil then
|
||||||
local vim = {}
|
local vim = {}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- @name Prove
|
||||||
|
-- @param
|
||||||
|
-- @short Run gnatprove
|
||||||
|
function Prove()
|
||||||
|
vim.cmd("new")
|
||||||
|
local run_cmd = { "alr gnatprove" }
|
||||||
|
vim.api.nvim_buf_set_lines(0, 0, -1, false, run_cmd)
|
||||||
|
vim.cmd(":%!bash")
|
||||||
|
|
||||||
|
buffer_loaded = true
|
||||||
|
end
|
||||||
|
|
||||||
|
-- @name Run
|
||||||
|
-- @param
|
||||||
|
-- @short Run program using alire
|
||||||
|
function Run()
|
||||||
|
vim.cmd("new")
|
||||||
|
local run_cmd = { "alr run" }
|
||||||
|
vim.api.nvim_buf_set_lines(0, 0, -1, false, run_cmd)
|
||||||
|
vim.cmd(":%!bash")
|
||||||
|
|
||||||
|
buffer_loaded = true
|
||||||
|
end
|
||||||
|
|
||||||
|
function Close_Prove()
|
||||||
|
if buffer_loaded then
|
||||||
|
buffer_loaded = false
|
||||||
|
vim.cmd("bd!")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
vim.keymap.set("n", "pp", ":lua Close_Prove()<cr>")
|
||||||
|
vim.keymap.set("n", "<leader>pp", ":lua Prove()<cr>")
|
||||||
|
vim.keymap.set("n", "<leader>op", ":lua Run()<cr>")
|
||||||
|
|
||||||
-- @name setup_ada
|
-- @name setup_ada
|
||||||
-- @param
|
-- @param
|
||||||
-- @short Verify installation of ada tools or install them.
|
-- @short Verify installation of ada tools or install them.
|
||||||
|
@ -30,19 +65,3 @@ vim.api.nvim_create_autocmd({ "BufLeave" }, {
|
||||||
pattern = { "*.adb", "*.ads" },
|
pattern = { "*.adb", "*.ads" },
|
||||||
callback = leave_ada,
|
callback = leave_ada,
|
||||||
})
|
})
|
||||||
|
|
||||||
-- @name format_file
|
|
||||||
-- @param
|
|
||||||
-- @short Run gnatpp as formatter on the current file.
|
|
||||||
local function format_file()
|
|
||||||
vim.cmd("checktime %")
|
|
||||||
local write_cmd = "gnatpp " .. vim.api.nvim_buf_get_name(0)
|
|
||||||
os.execute(write_cmd)
|
|
||||||
vim.cmd("checktime %")
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Add formatter command
|
|
||||||
vim.api.nvim_create_autocmd({ "BufWritePost" }, {
|
|
||||||
pattern = { "*.adb", "*.ads" },
|
|
||||||
callback = format_file,
|
|
||||||
})
|
|
||||||
|
|
|
@ -108,9 +108,6 @@ cmp.setup.cmdline({ "/", "?" }, {
|
||||||
|
|
||||||
-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
|
-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
|
||||||
cmp.setup.cmdline(":", {
|
cmp.setup.cmdline(":", {
|
||||||
view = {
|
|
||||||
entries = { name = "wildmenu", separator = ":" },
|
|
||||||
},
|
|
||||||
mapping = cmp.mapping.preset.cmdline(),
|
mapping = cmp.mapping.preset.cmdline(),
|
||||||
sources = cmp.config.sources({
|
sources = cmp.config.sources({
|
||||||
{ name = "path" },
|
{ name = "path" },
|
||||||
|
|
|
@ -12,9 +12,7 @@ local linters = {
|
||||||
ada = { "gnat", "gcc", "adals", "cspell" },
|
ada = { "gnat", "gcc", "adals", "cspell" },
|
||||||
}
|
}
|
||||||
|
|
||||||
vim.g.ale_linters = linters
|
local fixers = {
|
||||||
vim.g.ale_fix_on_save = 0
|
|
||||||
vim.g.ale_fixers = {
|
|
||||||
ada = { "gnatpp" },
|
ada = { "gnatpp" },
|
||||||
asm = { "gcc" },
|
asm = { "gcc" },
|
||||||
bash = { "bashate" },
|
bash = { "bashate" },
|
||||||
|
@ -28,5 +26,9 @@ vim.g.ale_fixers = {
|
||||||
haskell = { "fourmolu" },
|
haskell = { "fourmolu" },
|
||||||
}
|
}
|
||||||
|
|
||||||
|
vim.g.ale_linters = linters
|
||||||
|
vim.g.ale_fix_on_save = 0
|
||||||
|
vim.g.ale_fixers = fixers
|
||||||
|
|
||||||
vim.keymap.set("n", "<leader>lf", ":ALEFix<CR>")
|
vim.keymap.set("n", "<leader>lf", ":ALEFix<CR>")
|
||||||
vim.keymap.set("n", "<leader>ld", ":ALEDetail<CR>")
|
vim.keymap.set("n", "<leader>lp", ":ALEFindReferences<CR>")
|
||||||
|
|
|
@ -11,50 +11,42 @@ require("mason").setup(require("mason").setup({
|
||||||
|
|
||||||
require("mason-lspconfig").setup({
|
require("mason-lspconfig").setup({
|
||||||
ensure_installed = {
|
ensure_installed = {
|
||||||
"asm_lsp",
|
|
||||||
"clangd",
|
|
||||||
"hls",
|
|
||||||
"lua_ls",
|
"lua_ls",
|
||||||
"rust_analyzer",
|
|
||||||
"vhdl_ls",
|
|
||||||
"verible",
|
|
||||||
"vimls",
|
|
||||||
"texlab",
|
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
require("mason-lspconfig").setup_handlers({
|
-- require("mason-lspconfig").setup_handlers({
|
||||||
function(asm_lsp)
|
-- function(asm_lsp)
|
||||||
require("lspconfig")[asm_lsp].setup({})
|
-- require("lspconfig")[asm_lsp].setup({})
|
||||||
end,
|
-- end,
|
||||||
function(clangd)
|
-- function(clangd)
|
||||||
require("lspconfig")[clangd].setup({})
|
-- require("lspconfig")[clangd].setup({})
|
||||||
end,
|
-- end,
|
||||||
function(lua_ls)
|
-- function(lua_ls)
|
||||||
require("lspconfig")[lua_ls].setup({})
|
-- require("lspconfig")[lua_ls].setup({})
|
||||||
end,
|
-- end,
|
||||||
function(hls)
|
-- function(hls)
|
||||||
require("lspconfig")[hls].setup({})
|
-- require("lspconfig")[hls].setup({})
|
||||||
end,
|
-- end,
|
||||||
function(rust_analyzer)
|
-- function(rust_analyzer)
|
||||||
require("lspconfig")[rust_analyzer].setup({})
|
-- require("lspconfig")[rust_analyzer].setup({})
|
||||||
end,
|
-- end,
|
||||||
function(vhdl_ls)
|
-- function(vhdl_ls)
|
||||||
require("lspconfig")[vhdl_ls].setup({})
|
-- require("lspconfig")[vhdl_ls].setup({})
|
||||||
end,
|
-- end,
|
||||||
function(verible)
|
-- function(verible)
|
||||||
require("lspconfig")[verible].setup({})
|
-- require("lspconfig")[verible].setup({})
|
||||||
end,
|
-- end,
|
||||||
function(vimls)
|
-- function(vimls)
|
||||||
require("lspconfig")[vimls].setup({})
|
-- require("lspconfig")[vimls].setup({})
|
||||||
end,
|
-- end,
|
||||||
function(texlab)
|
-- function(texlab)
|
||||||
require("lspconfig")[texlab].setup({})
|
-- require("lspconfig")[texlab].setup({})
|
||||||
end,
|
-- end,
|
||||||
function(als)
|
-- function(als)
|
||||||
require("lspconfig")[als].setup({})
|
-- require("lspconfig")[als].setup({})
|
||||||
end,
|
-- end,
|
||||||
})
|
-- })
|
||||||
|
|
||||||
require("lspconfig").verible.setup({
|
require("lspconfig").verible.setup({
|
||||||
cmd = { "verible-verilog-ls", "--rules_config_search" },
|
cmd = { "verible-verilog-ls", "--rules_config_search" },
|
||||||
|
|
|
@ -32,7 +32,7 @@ end
|
||||||
|
|
||||||
-- Update function and call
|
-- Update function and call
|
||||||
function Update_Sys()
|
function Update_Sys()
|
||||||
vim.cmd("TSUpdate")
|
--vim.cmd("TSUpdate")
|
||||||
vim.cmd("MasonUpdate")
|
vim.cmd("MasonUpdate")
|
||||||
vim.cmd("Lazy sync")
|
vim.cmd("Lazy sync")
|
||||||
end
|
end
|
||||||
|
@ -50,9 +50,6 @@ vim.g.gitblame_date_format = "%r"
|
||||||
-- Floating terminal
|
-- Floating terminal
|
||||||
vim.keymap.set("n", "<C-t>", ":FloatermNew --height=0.9 --width=0.9 --wintype=float --name=terminal <CR>")
|
vim.keymap.set("n", "<C-t>", ":FloatermNew --height=0.9 --width=0.9 --wintype=float --name=terminal <CR>")
|
||||||
|
|
||||||
-- Key plugin
|
|
||||||
require("screenkeyconfig")
|
|
||||||
|
|
||||||
-- Set default colorscheme
|
-- Set default colorscheme
|
||||||
-- vim.cmd("colo vim-monokai-tasty")
|
-- vim.cmd("colo vim-monokai-tasty")
|
||||||
vim.cmd("colo sonokai")
|
vim.cmd("colo vim-monokai-tasty")
|
||||||
|
|
|
@ -57,7 +57,7 @@ return {
|
||||||
"dense-analysis/ale",
|
"dense-analysis/ale",
|
||||||
"f-person/git-blame.nvim",
|
"f-person/git-blame.nvim",
|
||||||
"dstein64/vim-startuptime",
|
"dstein64/vim-startuptime",
|
||||||
"NStefan002/screenkey.nvim",
|
"hiphish/rainbow-delimiters.nvim",
|
||||||
|
|
||||||
-- Themes
|
-- Themes
|
||||||
"folke/tokyonight.nvim",
|
"folke/tokyonight.nvim",
|
||||||
|
@ -91,4 +91,23 @@ return {
|
||||||
|
|
||||||
-- Plugins to test
|
-- Plugins to test
|
||||||
"https://git.nickr.eu/yannickreiss/nvim-macrotool.git",
|
"https://git.nickr.eu/yannickreiss/nvim-macrotool.git",
|
||||||
|
|
||||||
|
-- Wiki
|
||||||
|
{
|
||||||
|
"echaya/neowiki.nvim",
|
||||||
|
opts = {
|
||||||
|
wiki_dirs = {
|
||||||
|
-- neowiki.nvim supports both absolute and relative paths
|
||||||
|
{ name = "Personal", path = "~/.wiki" },
|
||||||
|
{ name = "RiscVar", path = "~/Documents/HSRM/riscvar.wiki" },
|
||||||
|
{ name = "Ada/Spark", path = "~/Documents/Science/ada_spark_wiki" },
|
||||||
|
{ name = "FPGA Book", path = "~/Documents/Science/FPGA_Design" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
keys = {
|
||||||
|
{ "<leader>ww", "<cmd>lua require('neowiki').open_wiki()<cr>", desc = "Open Wiki" },
|
||||||
|
{ "<leader>wW", "<cmd>lua require('neowiki').open_wiki_floating()<cr>", desc = "Open Floating Wiki" },
|
||||||
|
{ "<leader>wT", "<cmd>lua require('neowiki').open_wiki_new_tab()<cr>", desc = "Open Wiki in Tab" },
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,65 +0,0 @@
|
||||||
require("screenkey").setup({
|
|
||||||
win_opts = {
|
|
||||||
row = vim.o.lines - vim.o.cmdheight - 1,
|
|
||||||
col = vim.o.columns - 1,
|
|
||||||
relative = "editor",
|
|
||||||
anchor = "SE",
|
|
||||||
width = 40,
|
|
||||||
height = 3,
|
|
||||||
border = "single",
|
|
||||||
title = "Screenkey",
|
|
||||||
title_pos = "center",
|
|
||||||
style = "minimal",
|
|
||||||
focusable = false,
|
|
||||||
noautocmd = true,
|
|
||||||
},
|
|
||||||
compress_after = 3,
|
|
||||||
clear_after = 3,
|
|
||||||
disable = {
|
|
||||||
filetypes = {},
|
|
||||||
buftypes = {},
|
|
||||||
events = false,
|
|
||||||
},
|
|
||||||
show_leader = true,
|
|
||||||
group_mappings = false,
|
|
||||||
display_infront = {},
|
|
||||||
display_behind = {},
|
|
||||||
filter = function(keys)
|
|
||||||
return keys
|
|
||||||
end,
|
|
||||||
keys = {
|
|
||||||
["<TAB>"] = "",
|
|
||||||
["<CR>"] = "",
|
|
||||||
["<ESC>"] = "Esc",
|
|
||||||
["<SPACE>"] = "␣",
|
|
||||||
["<BS>"] = "",
|
|
||||||
["<DEL>"] = "Del",
|
|
||||||
["<LEFT>"] = "",
|
|
||||||
["<RIGHT>"] = "",
|
|
||||||
["<UP>"] = "",
|
|
||||||
["<DOWN>"] = "",
|
|
||||||
["<HOME>"] = "Home",
|
|
||||||
["<END>"] = "End",
|
|
||||||
["<PAGEUP>"] = "PgUp",
|
|
||||||
["<PAGEDOWN>"] = "PgDn",
|
|
||||||
["<INSERT>"] = "Ins",
|
|
||||||
["<F1>"] = "",
|
|
||||||
["<F2>"] = "",
|
|
||||||
["<F3>"] = "",
|
|
||||||
["<F4>"] = "",
|
|
||||||
["<F5>"] = "",
|
|
||||||
["<F6>"] = "",
|
|
||||||
["<F7>"] = "",
|
|
||||||
["<F8>"] = "",
|
|
||||||
["<F9>"] = "",
|
|
||||||
["<F10>"] = "",
|
|
||||||
["<F11>"] = "",
|
|
||||||
["<F12>"] = "",
|
|
||||||
["CTRL"] = "Ctrl",
|
|
||||||
["ALT"] = "Alt",
|
|
||||||
["SUPER"] = "",
|
|
||||||
["<leader>"] = "<leader>",
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
vim.keymap.set("n", "<leader>kk", ":Screenkey<CR>")
|
|
|
@ -16,7 +16,7 @@ vim.opt.shiftwidth = 4
|
||||||
vim.opt.expandtab = true
|
vim.opt.expandtab = true
|
||||||
vim.opt.splitright = true
|
vim.opt.splitright = true
|
||||||
vim.opt.splitbelow = true
|
vim.opt.splitbelow = true
|
||||||
vim.opt.relativenumber = true
|
vim.opt.relativenumber = false
|
||||||
vim.g.mapleader = ","
|
vim.g.mapleader = ","
|
||||||
vim.cmd("set clipboard+=unnamedplus")
|
vim.cmd("set clipboard+=unnamedplus")
|
||||||
vim.cmd("autocmd! CursorHold,CursorHoldI *.md write")
|
vim.cmd("autocmd! CursorHold,CursorHoldI *.md write")
|
||||||
|
|
Loading…
Reference in New Issue