Compare commits

..

6 Commits

Author SHA1 Message Date
Nick
aa7025dfc7 nickr -> nichkara update and removal of unused code
Some checks failed
Test Neovim config on push / build (ubuntu-20.04) (push) Failing after 37s
2025-10-19 07:09:40 +02:00
Nick
576bb711bb nickr -> nichkara update 2025-10-19 07:08:35 +02:00
Nick
ff55d76f71 Remove nix shell 2025-10-19 07:07:40 +02:00
Nick
b14e810dec Remove old plugins 2025-10-19 07:03:45 +02:00
Nick
19a27a004e Unset ada keymaps when leaving ada buffers 2025-10-19 07:01:20 +02:00
Nick
fb966de276 Beautify ada_mode to conform to lua standards 2025-10-19 06:52:52 +02:00
5 changed files with 16 additions and 103 deletions

View File

@@ -1,8 +1,3 @@
-- Lua vim-dummy variable
if vim == nil then
local vim = {}
end
-- @name Prove
-- @param
-- @short Run gnatprove
@@ -12,7 +7,7 @@ function Prove()
vim.api.nvim_buf_set_lines(0, 0, -1, false, run_cmd)
vim.cmd(":%!bash")
buffer_loaded = true
Buffer_loaded = true
end
-- @name Run
@@ -24,25 +19,24 @@ function Run()
vim.api.nvim_buf_set_lines(0, 0, -1, false, run_cmd)
vim.cmd(":%!bash")
buffer_loaded = true
Buffer_loaded = true
end
function Close_Prove()
if buffer_loaded then
buffer_loaded = false
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
-- @param
-- @short Verify installation of ada tools or install them.
local function setup_ada()
vim.keymap.set("n", "<leader>cb", ":!gnatpp %<cr>")
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>")
vim.opt.tabstop = 3
vim.opt.shiftwidth = 3
end
@@ -57,6 +51,10 @@ vim.api.nvim_create_autocmd({ "BufEnter" }, {
-- @param
-- @short Leave ada and reverse any changes to my editor defaults
local function leave_ada()
vim.keymap.del("n", "<leader>cb", ":!gnatpp %<cr>")
vim.keymap.del("n", "pp", ":lua Close_Prove()<cr>")
vim.keymap.del("n", "<leader>pp", ":lua Prove()<cr>")
vim.keymap.del("n", "<leader>op", ":lua Run()<cr>")
vim.opt.tabstop = 4
vim.opt.shiftwidth = 4
end

View File

@@ -11,7 +11,7 @@ local function setup_pascal()
-- if return value is 1, get ptop
if check_ptop == 1 then
os.execute("wget -O ~/.local/bin/ptop https://www.nickr.eu/data/ptop64")
os.execute("wget -O ~/.local/bin/ptop https://www.nichkara.eu/data/ptop64")
os.execute("chmod +x ~/.local/bin/ptop")
end
@@ -35,22 +35,3 @@ vim.api.nvim_create_autocmd({ "BufLeave" }, {
pattern = { "*.pas" },
callback = leave_pascal,
})
-- @name auto_format
-- @param
-- @short The format function for pascal.
local function auto_format()
vim.cmd("checktime %")
local write_cmd = "ptop -i 4 -c ~/.config/nvim/ptop.conf "
.. vim.api.nvim_buf_get_name(0)
.. " "
.. 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 = { "*.pas" },
-- callback = auto_format,
--})

View File

@@ -7,7 +7,6 @@ return {
"SirVer/UltiSnips",
"cohama/lexima.vim",
"voldikss/vim-floaterm",
"https://git.nickr.eu/yannickreiss/nvim-sourcer.git",
-- Navigation
"preservim/nerdtree",
@@ -110,7 +109,6 @@ return {
"veryl-lang/veryl.vim",
-- Plugins to test
"https://git.nickr.eu/yannickreiss/nvim-macrotool.git",
-- Wiki
{

View File

@@ -46,67 +46,8 @@ vim.keymap.set("n", "<leader>lm", ":set number<cr>")
vim.keymap.set("n", "<leader>na", ":set norelativenumber<cr>")
vim.keymap.set("n", "<leader>nr", ":set relativenumber<cr>")
-- Nix mode
local nix_interpreter_buffer = -1
local nix_interpreter_window = -1
-- @name run_nix_interpreter
-- @param
-- @short Run nix and output to a buffer on the right
local function run_nix_interpreter()
local original_win = vim.api.nvim_get_current_win()
vim.cmd("vsplit")
nix_interpreter_buffer = vim.api.nvim_create_buf(false, true)
vim.api.nvim_win_set_buf(0, nix_interpreter_buffer)
nix_interpreter_window = vim.api.nvim_get_current_win()
vim.api.nvim_set_current_win(original_win)
end
-- @name update_nix_interpreter
-- @param
-- @short Run nix enterpreter on that file.
local function update_nix_interpreter()
local filename = vim.api.nvim_buf_get_name(0)
if filename == "" then
vim.api.nvim_buf_set_lines(nix_interpreter_buffer, 0, -1, false, {
"Error: Current buffer has no file name.",
})
return
end
local cmd = { "nix-instantiate", "--eval", "--strict", filename }
local output = vim.fn.systemlist(cmd)
if vim.v.shell_error ~= 0 then
table.insert(output, 1, "Error running nix-instantiate:")
end
vim.api.nvim_buf_set_lines(nix_interpreter_buffer, 0, -1, false, output)
end
-- @name close_nix_interpreter
-- @param
-- @short Closes the window and buffer of the interpreter
local function close_nix_interpreter()
vim.api.nvim_buf_delete(nix_interpreter_buffer, { unload = true })
vim.api.nvim_win_close(nix_interpreter_window, true)
end
vim.api.nvim_create_autocmd({ "BufEnter" }, {
pattern = { "*.nix" },
callback = run_nix_interpreter,
})
vim.api.nvim_create_autocmd({ "BufWritePost" }, {
pattern = { "*.nix" },
callback = update_nix_interpreter,
})
vim.api.nvim_create_autocmd({ "BufLeave" }, {
pattern = { "*.nix" },
callback = close_nix_interpreter,
})
vim.filetype.add({
extension = {
bf = "brainfuck",
},
})

View File

@@ -1,13 +1,8 @@
-- vim dummy assignment for the lsp
if vim == nil then
local vim = {}
end
-- Setup the formatter for VHDL
-- Download for current platform type if not already present
local check_formatter = { os.execute("which ~/.local/bin/vhdlfmt") }
if check_formatter == 1 then
-- setup the formatter here
os.execute("wget -O ~/.local/bin/vhdlfmt https://www.nickr.eu/data/vhdlfmt")
os.execute("wget -O ~/.local/bin/vhdlfmt https://www.nichkara.eu/data/vhdlfmt")
os.execute("chmod +x ~/.local/bin/vhdlfmt")
end