push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,15 @@
diff --git a/lua/aider.lua b/lua/aider.lua
index 98b5071..589b06d 100644
--- a/lua/aider.lua
+++ b/lua/aider.lua
@@ -61,9 +61,9 @@ function M.AiderOpen(args, window_type)
log("Existing aider buffer found, opening in new window")
helpers.open_buffer_in_new_window(window_type, M.aider_buf)
else
log("No existing aider buffer, creating new one")
- local command = "aider " .. (args or "")
+ local command = "@aider@ " .. (args or "")
log("Opening window with type: " .. window_type)
helpers.open_window(window_type)
log("Adding buffers to command")
command = helpers.add_buffers_to_command(command, is_valid_buffer)

View File

@@ -0,0 +1,13 @@
diff --git a/plugin/activitywatch.vim b/plugin/activitywatch.vim
index 6986553..7462b02 100644
--- a/plugin/activitywatch.vim
+++ b/plugin/activitywatch.vim
@@ -29,7 +29,7 @@ let s:heartbeat_apiurl = printf('%s/heartbeat?pulsetime=30', s:bucket_apiurl)
let s:http_response_code = {}
function! HTTPPostJson(url, data)
- let l:req = ['curl', '-s', a:url,
+ let l:req = ['@curl@', '-s', a:url,
\ '-H', 'Content-Type: application/json',
\ '-X', 'POST',
\ '-d', json_encode(a:data),

View File

@@ -0,0 +1,31 @@
diff --git a/chadtree/__main__.py b/chadtree/__main__.py
index 83341fc..af8c9b0 100644
if command == "deps":
@@ -129,7 +129,7 @@ elif command == "run":
try:
if not _IN_VENV:
raise ImportError()
- elif lock != _REQ:
+ elif False:
raise ImportError()
else:
import pynvim_pp
diff --git a/chadtree/consts.py b/chadtree/consts.py
index e2d3aa0..e77a129 100644
--- a/chadtree/consts.py
+++ b/chadtree/consts.py
@@ -1,4 +1,5 @@
from os import environ, name
+from pathlib import Path
from chad_types import TOP_LEVEL
@@ -24,7 +25,7 @@ SETTINGS_VAR = "chadtree_settings"
STORAGE
"""
-_VARS = TOP_LEVEL / ".vars"
+_VARS = Path.home() / ".cache/chadtree/vars"
RT_DIR = _VARS / "runtime"
RT_PY = RT_DIR / "Scripts" / "python.exe" if IS_WIN else RT_DIR / "bin" / "python3"
SESSION_DIR = _VARS / "sessions"

View File

@@ -0,0 +1,35 @@
diff --git a/coq/__main__.py b/coq/__main__.py
index f588f718..36bcca21 100644
--- a/coq/__main__.py
+++ b/coq/__main__.py
@@ -78,7 +78,7 @@ _EXEC_PATH = Path(executable)
_EXEC_PATH = _EXEC_PATH.parent.resolve(strict=True) / _EXEC_PATH.name
_REQ = REQUIREMENTS.read_text()
-_IN_VENV = _RT_PY.parent.resolve() / _RT_PY.name == _EXEC_PATH
+_IN_VENV = True
if command == "deps":
@@ -152,7 +152,7 @@ elif command == "run":
try:
if not _IN_VENV:
raise ImportError()
- elif lock != _REQ:
+ elif False:
raise ImportError()
else:
import pynvim_pp
diff --git a/coq/consts.py b/coq/consts.py
index 804e92ab..5c090a93 100644
--- a/coq/consts.py
+++ b/coq/consts.py
@@ -10,7 +10,7 @@ TOP_LEVEL = Path(__file__).resolve(strict=True).parent.parent
REQUIREMENTS = TOP_LEVEL / "requirements.txt"
-VARS = TOP_LEVEL / ".vars"
+VARS = Path.home() / ".cache/coq_nvim/vars"
RT_DIR = VARS / "runtime"
RT_PY = RT_DIR / "Scripts" / "python.exe" if IS_WIN else RT_DIR / "bin" / "python3"

View File

@@ -0,0 +1,31 @@
From f8e993846551bda77a34a77aad7ad6dcc45b66a7 Mon Sep 17 00:00:00 2001
From: Philipp Joram <nixpgks@phijor.me>
Date: Tue, 16 Apr 2024 12:48:42 +0300
Subject: [PATCH] Unconditionally use global binary
---
ftplugin/agda.vim | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/ftplugin/agda.vim b/ftplugin/agda.vim
index c7dd9d0..6b4aba3 100644
--- a/ftplugin/agda.vim
+++ b/ftplugin/agda.vim
@@ -11,13 +11,7 @@ if exists("b:cornelis_ftplugin")
endif
let b:cornelis_ftplugin = 1
-if exists("g:cornelis_use_global_binary")
- call remote#host#Register('cornelis', '*', rpcstart('cornelis', []))
-else
- call nvimhs#start(expand('<sfile>:p:h:h'), 'cornelis', ['-v', 'DEBUG', '-l', '/tmp/cornelis.log'])
-endif
-
-nnoremap <F5> :call nvimhs#compileAndRestart('cornelis')<CR>
+call remote#host#Register('cornelis', '*', rpcstart('@CORNELIS@', []))
runtime agda-input.vim
runtime agda-matchpairs.vim
--
2.44.0

View File

@@ -0,0 +1,25 @@
diff --git a/rplugin/python3/fruzzy_mod.nim b/rplugin/python3/fruzzy_mod.nim
index dba0689..0109285 100644
--- a/rplugin/python3/fruzzy_mod.nim
+++ b/rplugin/python3/fruzzy_mod.nim
@@ -12,9 +12,7 @@ when defined(profile):
import nimprof
proc getVersion(): string {.compileTime.}=
- let ver = staticExec("git describe --tags --always --dirty").strip()
- # let cTime = format(times.now(), "yyyy-MM-dd hh:mm:ss")
- let branch = staticExec("git rev-parse --abbrev-ref HEAD").strip()
+ let ver = "@version@"
var options:seq[string] = newSeq[string]()
if not defined(removelogger):
options.add("info")
@@ -26,7 +24,7 @@ proc getVersion(): string {.compileTime.}=
options.add("release")
let optionsStr = options.join(",")
- return &"rev: {ver} on branch: {branch} with options: {optionsStr}"
+ return &"version: {ver} with options: {optionsStr}"
let L = newConsoleLogger(levelThreshold = logging.Level.lvlDebug)
addHandler(L)

View File

@@ -0,0 +1,13 @@
diff --git a/lua/gx/init.lua b/lua/gx/init.lua
index 12272d4..c51771a 100644
--- a/lua/gx/init.lua
+++ b/lua/gx/init.lua
@@ -73,7 +73,7 @@ local function get_open_browser_app()
if sysname == "Darwin" then
app = "open"
elseif sysname == "Linux" then
- app = "xdg-open"
+ app = "@xdg-utils@/bin/xdg-open"
elseif sysname == "Windows_NT" then
app = "powershell.exe"
end

View File

@@ -0,0 +1,14 @@
diff --git a/lua/lazy/help.lua b/lua/lazy/help.lua
index 4a289eb..5ddc168 100644
--- a/lua/lazy/help.lua
+++ b/lua/lazy/help.lua
@@ -38,9 +38,6 @@ function M.index(plugin)
end
function M.update()
- if Config.plugins["lazy.nvim"] then
- vim.cmd.helptags(Config.plugins["lazy.nvim"].dir .. "/doc")
- end
if Config.options.readme.enabled == false then
return
end

View File

@@ -0,0 +1,12 @@
diff --git a/doc/lens.txt b/doc/lens.txt
index 60943ce..2fe43dc 100644
--- a/doc/lens.txt
+++ b/doc/lens.txt
@@ -76,7 +76,6 @@ g:lens#disabled_filenames
Default value is [].
*g:lens#animate*
- *g:lens#animate*
g:lens#animate
If value is 1 and animate.vim is installed, the window resize
will be animated.

View File

@@ -0,0 +1,31 @@
diff --git a/autoload/health/mkdp.vim b/autoload/health/mkdp.vim
index 323b57b..8053ea8 100644
--- a/autoload/health/mkdp.vim
+++ b/autoload/health/mkdp.vim
@@ -8,8 +8,8 @@ function! health#mkdp#check() abort
lua vim.health.info('Pre build: ' .. vim.api.nvim_eval('l:mkdp_server_script'))
lua vim.health.info('Pre build version: ' .. vim.fn['mkdp#util#pre_build_version']())
lua vim.health.ok('Using pre build')
- elseif executable('node')
- lua vim.health.info('Node version: ' .. string.gsub(vim.fn.system('node --version'), '^%s*(.-)%s*$', '%1'))
+ else
+ lua vim.health.info('Node version: ' .. string.gsub(vim.fn.system('@node@ --version'), '^%s*(.-)%s*$', '%1'))
let l:mkdp_server_script = s:mkdp_root_dir .. '/app/server.js'
lua vim.health.info('Script: ' .. vim.api.nvim_eval('l:mkdp_server_script'))
lua vim.health.info('Script exists: ' .. vim.fn.filereadable(vim.api.nvim_eval('l:mkdp_server_script')))
diff --git a/autoload/mkdp/rpc.vim b/autoload/mkdp/rpc.vim
index b257571..57f04e7 100644
--- a/autoload/mkdp/rpc.vim
+++ b/autoload/mkdp/rpc.vim
@@ -41,9 +41,9 @@ function! mkdp#rpc#start_server() abort
let l:mkdp_server_script = s:mkdp_root_dir . '/app/bin/markdown-preview-' . mkdp#util#get_platform()
if executable(l:mkdp_server_script)
let l:cmd = [l:mkdp_server_script, '--path', s:mkdp_root_dir . '/app/server.js']
- elseif executable('node')
+ else
let l:mkdp_server_script = s:mkdp_root_dir . '/app/index.js'
- let l:cmd = ['node', l:mkdp_server_script, '--path', s:mkdp_root_dir . '/app/server.js']
+ let l:cmd = ['@node@', l:mkdp_server_script, '--path', s:mkdp_root_dir . '/app/server.js']
endif
if exists('l:cmd')
if s:is_vim

View File

@@ -0,0 +1,48 @@
{
"name": "markdown-preview",
"version": "0.0.10",
"description": "markdown preview plugin for (neo)vim",
"bin": "./app/server.js",
"repository": "https://github.com/iamcco/markdown-preview.nvim.git",
"author": "年糕小豆汤 <ooiss@qq.com>",
"license": "MIT",
"private": true,
"scripts": {
"watch": "tsc -w -p ./",
"build-app": "cd app && rm -rf ./.next && next build && next export",
"build-lib": "tsc -p ./",
"build": "tsc -p ./ && cd app && rm -rf ./.next && next build && next export && yarn && pkg --targets node16-linux-x64,node16-macos-x64,node16-win-x64 --out-path ./bin . && rm -rf ./node_modules ./.next"
},
"dependencies": {
"@chemzqm/neovim": "^5.7.9",
"chart.js": "^2.7.3",
"highlight.js": "^10.4.1",
"log4js": "^6.4.0",
"markdown-it": "^12.3.2",
"markdown-it-anchor": "^5.2.4",
"markdown-it-deflist": "^2.0.3",
"markdown-it-emoji": "^1.4.0",
"markdown-it-footnote": "^3.0.1",
"markdown-it-task-lists": "^2.1.1",
"markdown-it-toc-done-right": "^4.0.1",
"md-it-meta": "^0.0.2",
"msgpack-lite": "^0.1.26",
"next": "^7.0.2",
"next-routes": "^1.4.2",
"plantuml-encoder": "^1.4.0",
"react": "^16.5.2",
"react-dom": "^16.5.2",
"socket.io": "^2.1.1",
"socket.io-client": "^2.1.1"
},
"devDependencies": {
"@types/node": "16",
"pkg": "^5.6.0",
"prettier": "^2.6.2",
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0",
"tslint-plugin-prettier": "^2.3.0",
"typescript": "^4.6.4",
"yuuko-tsconfig": "^1.0.0"
}
}

View File

@@ -0,0 +1,26 @@
diff --git a/autoload/health/openscad_nvim.vim b/autoload/health/openscad_nvim.vim
index d6d4b4c..9853877 100644
--- a/autoload/health/openscad_nvim.vim
+++ b/autoload/health/openscad_nvim.vim
@@ -15,7 +15,7 @@ function! s:check_zathura_installed() abort
endfunction
function! s:check_htop_installed() abort
- if !executable('htop')
+ if !executable('@htop@')
call v:lua.vim.health.error('has(htop)','install htop')
else
call v:lua.vim.health.ok("htop is installed")
diff --git a/lua/openscad.lua b/lua/openscad.lua
index 0a26d08..1264989 100644
--- a/lua/openscad.lua
+++ b/lua/openscad.lua
@@ -126,7 +126,7 @@ function M.exec_openscad()
jobCommand = '/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD ' .. filename
else
-- TODO: What about Windows?
- jobCommand = 'openscad ' .. filename
+ jobCommand = '@openscad@ ' .. filename
end
vim.fn.jobstart(jobCommand)

View File

@@ -0,0 +1,37 @@
diff --git a/app/src/main.ts b/app/src/main.ts
index c82d914..e8542f3 100644
--- a/app/src/main.ts
+++ b/app/src/main.ts
@@ -73,7 +73,7 @@ async function init(socket: WebSocket) {
const onListen: Deno.ServeOptions['onListen'] = ({ hostname, port }) => {
const serverUrl = `${hostname.replace('0.0.0.0', 'localhost')}:${port}`;
logger.info(`listening on ${serverUrl}`);
- const webview = new Deno.Command('deno', {
+ const webview = new Deno.Command('@deno@', {
cwd: dirname(fromFileUrl(Deno.mainModule)),
args: [
'run',
diff --git a/lua/peek/app.lua b/lua/peek/app.lua
index af5148e..5e67563 100644
--- a/lua/peek/app.lua
+++ b/lua/peek/app.lua
@@ -38,10 +38,17 @@ function module.setup()
end
cmd = vim.list_extend({
- 'deno',
- 'task',
- '--quiet',
+ '@deno@',
'run',
+ '--allow-read',
+ '--allow-write',
+ '--allow-net',
+ '--allow-env',
+ '--allow-run',
+ '--no-check',
+ '--allow-import',
+ '--no-lock',
+ '../../app/src/main.ts',
}, args)
end

View File

@@ -0,0 +1,22 @@
diff --git a/lua/preview.lua b/lua/preview.lua
index 6d9875d..729cc70 100644
--- a/lua/preview.lua
+++ b/lua/preview.lua
@@ -28,7 +28,7 @@ local function open_window(file)
vim.env.MDT_WIDTH = width
vim.cmd.vnew()
- vim.fn.termopen("mdt " .. file)
+ vim.fn.termopen("@mdt@ " .. file)
vim.cmd("setlocal nonumber norelativenumber")
vim.api.nvim_feedkeys("a", "t", false)
@@ -49,7 +49,7 @@ end
function M.setup()
-- Check if "mdt" is installed
if vim.fn.executable("mdt") == 0 then
- install()
+ -- install()
end
set_cmd()

View File

@@ -0,0 +1,31 @@
diff --git a/lua/ranger-nvim.lua b/lua/ranger-nvim.lua
index be95e36..3bd1587 100644
--- a/lua/ranger-nvim.lua
+++ b/lua/ranger-nvim.lua
@@ -127,7 +127,7 @@ local function build_ranger_cmd(select_current_file)
local selectfile_flag = select_current_file and " --selectfile=" .. selected_file or ""
if select_current_file then
return string.format(
- "ranger --choosefiles=%s %s %s",
+ "@ranger@ --choosefiles=%s %s %s",
SELECTED_FILEPATH,
selectfile_flag,
create_ranger_cmd_flags(create_cmd_values(opts.keybinds))
@@ -135,7 +135,7 @@ local function build_ranger_cmd(select_current_file)
else
vim.api.nvim_buf_delete(1, { force = true })
return string.format(
- "ranger --choosefiles=%s %s %s",
+ "@ranger@ --choosefiles=%s %s %s",
SELECTED_FILEPATH,
create_ranger_cmd_flags(create_cmd_values(opts.keybinds)),
get_absolute_argument()
@@ -209,7 +209,7 @@ end
---Opens ranger and open selected files on exit.
---@param select_current_file boolean|nil open ranger and select the current file. Defaults to true.
function M.open(select_current_file)
- if vim.fn.executable("ranger") ~= 1 then
+ if vim.fn.executable("@ranger@") ~= 1 then
vim.api.nvim_err_write(
"ranger executable not found, please check that ranger is installed and is in your path\n"
)

View File

@@ -0,0 +1,13 @@
diff --git a/lua/tsc/utils.lua b/lua/tsc/utils.lua
index 6433bcb..75760f9 100644
--- a/lua/tsc/utils.lua
+++ b/lua/tsc/utils.lua
@@ -16,7 +16,7 @@ M.find_tsc_bin = function()
return node_modules_tsc_binary
end
- return "tsc"
+ return "@tsc@"
end
--- @param run_mono_repo boolean

View File

@@ -0,0 +1,11 @@
--- vim-grammarous-51ef519.org/autoload/grammarous.vim 1970-01-01 01:00:01.000000000 +0100
+++ vim-grammarous-51ef519/autoload/grammarous.vim 2017-11-21 16:33:27.473403322 +0000
@@ -22,7 +22,7 @@
let g:grammarous#enable_spell_check = get(g:, 'grammarous#enable_spell_check', 0)
let g:grammarous#move_to_first_error = get(g:, 'grammarous#move_to_first_error', 1)
let g:grammarous#hooks = get(g:, 'grammarous#hooks', {})
-let g:grammarous#languagetool_cmd = get(g:, 'grammarous#languagetool_cmd', '')
+let g:grammarous#languagetool_cmd = get(g:, 'grammarous#languagetool_cmd', '@languagetool@/bin/languagetool-commandline')
let g:grammarous#show_first_error = get(g:, 'grammarous#show_first_error', 0)
highlight default link GrammarousError SpellBad

View File

@@ -0,0 +1,13 @@
diff --git a/plugin/sensible.vim b/plugin/sensible.vim
index c9387ae..a226760 100644
--- a/plugin/sensible.vim
+++ b/plugin/sensible.vim
@@ -26,7 +26,7 @@ function! s:MaySet(option) abort
silent verbose execute 'setglobal all' a:option . '?'
redir END
endif
- return out !~# " \\(\\~[\\/]\\|Lua\\)[^\n]*$"
+ return out !~# "/nix/store/.*" && out !~# " \\(\\~[\\/][^\n]*\\|Lua\\)$"
endfunction
if s:MaySet('backspace')