repositories / dotfiles

dotfiles

bugabingas dorkfiles

owned by bugabinga

neovim: puck downloads tarballs now

0e91e46516d2d4657b6c28f82260f2ee9ffba0ab

Oliver Jan Krylow <oliver@bugabinga.net> ·

unsigned

Browse filesCompare with HEAD

Changed files (12)

neovim/coco.lua

Added
new file mode 100644
1 +local vim = _G['vim'] or error 'where is my vim'
2 +local co = coroutine
4 +local function current_non_main_co()
5 + local data = { coroutine.running(), }
7 + if select( '#', unpack( data ) ) == 2 then
8 + local co, is_main = unpack( data )
9 + if is_main then
10 + return nil
11 + end
12 + return co
13 + end
15 + return unpack( data )
16 +end
18 +local function wrap( func, argc, opts )
19 + opts = vim.tbl_extend( 'keep', opts or {}, { strict = true, } )
20 + vim.validate { func = { func, 'function', }, argc = { argc, 'number', }, }
21 + local protected = function ( ... )
22 + local args = { ..., }
23 + local cb = args[argc]
24 + args[argc] = function ( ... )
25 + cb( true, ... )
26 + end
27 + xpcall( func, function ( err )
28 + cb( false, err, debug.traceback() )
29 + end, unpack( args, 1, argc ) )
30 + end
32 + return function ( ... )
33 + if not current_non_main_co() then
34 + if opts.strict then
35 + error 'Cannot call async function from non-async context'
36 + end
37 + return func( ... )
38 + end
40 + local ret = { coroutine.yield( argc, protected, ... ), }
41 + local success = ret[1]
42 + if not success then
43 + error( ('Wrapped function failed: %s\n%s'):format( ret[2], ret[3] ) )
44 + end
45 + return unpack( ret, 2, table.maxn( ret ) )
46 + end
47 +end
49 +local dbg = function ( fmt, ... )
50 + vim.print( string.format( fmt, ... ) )
51 +end
53 +local load_version = function ( prg, callback )
54 + vim.validate {
55 + prg = { prg, 'string', },
56 + callback = { callback, 'function', },
57 + }
59 + return co.create( function ()
60 + local current_thread = co.running()
61 + local stdin = nil;
62 + local stdout = vim.uv.new_pipe();
63 + local stderr = vim.uv.new_pipe();
64 + local process_result = {}
65 + local process_error = {}
66 + local handle, pid = vim.uv.spawn( prg, {
67 + stdio = { stdin, stdout, stderr, },
68 + args = { '--version', },
69 + hide = true,
70 + }, function ( code, signal )
71 + dbg( 'process done with code: %d, signal: %s', code, signal )
72 + callback( process_error, process_result, code, signal )
73 + co.resume( current_thread )
74 + end )
75 + if not handle then
76 + error( string.format( 'program %s could not be spawned', prg ) )
77 + end
79 + -- dbg( 'process open with handle: %s and pid %d', handle, pid )
81 + vim.uv.read_start( stdout, function ( err, data )
82 + if err then
83 + dbg( err )
84 + elseif data then
85 + -- dbg( 'chunk of stdout: %s', data )
86 + table.insert( process_result, data )
87 + else
88 + -- dbg 'stdout done'
89 + end
90 + end )
92 + vim.uv.read_start( stderr, function ( err, data )
93 + if err then
94 + dbg( err )
95 + elseif data then
96 + -- dbg( 'chunk of stderr: %s', data )
97 + table.insert( process_error, data )
98 + else
99 + -- dbg 'stderr done'
100 + end
101 + end )
103 + co.yield()
104 + end )
105 +end
109 +local java = load_version( 'java', function ( err, result, code, signal )
110 + if #err ~= 0 then
111 + dbg( 'err: %s, code: %s, signal: %s', table.concat( err ), code, signal )
112 + else
113 + dbg( 'java version is: %s', table.concat( result ) )
114 + end
115 +end )
117 +local cargo = load_version( 'cargo', function ( err, result )
118 + dbg( 'cargo version is: %s', table.concat( result ) )
119 +end )
121 +local nvim = load_version( 'nvim', function ( err, result )
122 + dbg( 'nvim version is: %s', table.concat( result ) )
123 +end )
128 +-- vim.uv.run()
129 +-- vim.uv.run 'once'
130 +-- vim.wait( 300, function ()
131 +-- dbg '---'
132 +-- end, 300 )

neovim/init2.lua

Added
new file mode 100644
1 +local puck = require 'puck'
2 +local gh = puck.plugin_types.github.type
3 +local cb = puck.plugin_types.codeberg.type
4 +local srht = puck.plugin_types.sourcehut.type
5 +local dev = puck.plugin_types.development.type
7 +-- TODO move this outside
8 +-- testing the puck
9 +local plugins = {
10 + { dev, 'bugabinga/venn.nvim', },
11 + { gh, 'nyoom-engineering/oxocarbon.nvim', 'c5846d10cbe4131cc5e32c6d00beaf59cb60f6a2', },
12 + { srht, '~adigitoleo/haunt.nvim', 'e3e3c8f45663fed8225ba5efb0af00a2df14a736', },
13 + { cb, 'jthvai/lavender.nvim', 'a5187e6f4afe4b1f2fbcd0fe0bad34c40002ba48', },
14 + { dev, 'bugabinga/auto-dark-mode.nvim', },
17 +puck.setup {
18 + plugins = plugins,
19 + -- TODO change Workspace on win32
20 + workspace = '~/Workspace',

neovim/lazy-lock.json

Modified
8 8 "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
9 9 "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
10 10 "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
11 - "colorizer.nvim": { "branch": "master", "commit": "107719885290366c893e1c1c58b7474cbeabfef6" },
12 - "conform.nvim": { "branch": "master", "commit": "f3b930db4964d60e255c8f9e37b7f2218dfc08cb" },
11 + "colorizer.nvim": { "branch": "master", "commit": "7f84ba0d39b37484f5f1f838cafda9cb5241a532" },
12 + "conform.nvim": { "branch": "master", "commit": "88b699b595703f1ae9d9061c050e52b1fe7c33f1" },
13 13 "diffview.nvim": { "branch": "main", "commit": "3afa6a053f680e9f1329c4a151db988a482306cd" },
14 - "dressing.nvim": { "branch": "master", "commit": "3c38ac861e1b8d4077ff46a779cde17330b29f3a" },
14 + "dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" },
15 15 "fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" },
16 16 "flash.nvim": { "branch": "main", "commit": "7bb4a9c75d1e20cd24185afedeaa11681829ba23" },
17 17 "gitsigns.nvim": { "branch": "main", "commit": "76927d14d3fbd4ba06ccb5246e79d93b5442c188" },
18 18 "glow.nvim": { "branch": "main", "commit": "238070a686c1da3bccccf1079700eb4b5e19aea4" },
19 19 "heirline.nvim": { "branch": "master", "commit": "0d797435e54645a5f98bad7ad6046aac1ef95c1e" },
20 20 "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" },
21 - "lazy.nvim": { "branch": "main", "commit": "eab487c2520f0fe9e54eb5e3ea0606e20512492e" },
21 + "lazy.nvim": { "branch": "main", "commit": "0fc34a0cf5f5f6f998a0897119a7d846b47eaa9d" },
22 22 "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
23 23 "mini.bracketed": { "branch": "main", "commit": "06ad08fc75dc540cba76d3d8de0f2dc9f75b5812" },
24 24 "mini.bufremove": { "branch": "main", "commit": "e6044aa28e61d4dd9ec86194d6f81743eced0c1c" },
25 25 "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
26 - "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
26 + "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" },
27 27 "neogen": { "branch": "main", "commit": "6de0add4805165317ab7d3d36b5cef48b1b865f3" },
28 28 "nrpattern.nvim": { "branch": "master", "commit": "f862ce687761078ef3155688151c55f69d28453e" },
29 - "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" },
29 + "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" },
30 30 "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
31 31 "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
32 - "nvim-genghis": { "branch": "main", "commit": "6c3a123dcd355a33f5dd624b0a841e8f88c11f8d" },
32 + "nvim-genghis": { "branch": "main", "commit": "7055134943460d962b4909b43b4c3cd5f011c153" },
33 33 "nvim-gomove": { "branch": "main", "commit": "2b44ae7ac0804f4e3959228122f7c85bef1964e3" },
34 34 "nvim-lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" },
35 - "nvim-lint": { "branch": "master", "commit": "2f90fe977ef21db3bf3b7a1ceaf4a1e3aafb2b26" },
35 + "nvim-lint": { "branch": "master", "commit": "1a3a8d047bc01f1760ae4a0f5e80f111ea222e67" },
36 36 "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" },
37 37 "nvim-navbuddy": { "branch": "master", "commit": "f22bac988f2dd073601d75ba39ea5636ab6e38cb" },
38 38 "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
39 - "nvim-neoclip.lua": { "branch": "main", "commit": "9b02a625dfa22499089458554be86171a1dfe8b1" },
40 - "nvim-spectre": { "branch": "master", "commit": "366f46fdd4a1593cc237aea13d5ef113739a472c" },
39 + "nvim-neoclip.lua": { "branch": "main", "commit": "709c97fabec9da7d04f7d2f5e207423af8c02871" },
40 + "nvim-spectre": { "branch": "master", "commit": "4d22fe03554056de4325762add3e546c77e3a275" },
41 41 "nvim-surround": { "branch": "main", "commit": "f1f0699a1d49f28e607ffa4361f1bbe757ac5ebc" },
42 42 "nvim-tree.lua": { "branch": "master", "commit": "2bc725a3ebc23f0172fb0ab4d1134b81bcc13812" },
43 - "nvim-treesitter": { "branch": "master", "commit": "979beffc1a86e7ba19bd6535c0370d8e1aaaad3c" },
44 - "nvim-treesitter-context": { "branch": "master", "commit": "f62bfe19e0fbc13ae95649dfb3cf22f4ff85b683" },
43 + "nvim-treesitter": { "branch": "master", "commit": "49e4e2b4b62360677568c47b6467f31c809b391c" },
44 + "nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" },
45 45 "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" },
46 - "nvim-treesitter-textobjects": { "branch": "master", "commit": "fd41b7ccc5490a3a99c734d1ee418b68d06c48a9" },
47 - "nvim-ts-autotag": { "branch": "main", "commit": "bcf3146864262ef2d3c877beba3e222b5c73780d" },
46 + "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" },
47 + "nvim-ts-autotag": { "branch": "main", "commit": "6eb4120a1aadef07ac312f1c4bc6456712220007" },
48 48 "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" },
49 49 "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" },
50 50 "nvim-window": { "branch": "main", "commit": "81f29840ac3aaeea6fc2153edfabebd00d692476" },
51 - "oil.nvim": { "branch": "master", "commit": "2cb39e838e9dcd8b374f09a3a87a2e5ec9d372f6" },
51 + "oil.nvim": { "branch": "master", "commit": "bbc0e67eebc15342e73b146a50d9b52e6148161b" },
52 52 "pair-ls.nvim": { "branch": "master", "commit": "ccf3280d8cafec48e4947dd827abbc456435dfad" },
53 53 "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
54 54 "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
55 55 "qf_helper.nvim": { "branch": "master", "commit": "fa3c2f3f2706e2c9984409c9c14b5993302ddfa7" },
56 - "schemastore.nvim": { "branch": "main", "commit": "931f9f3b7b60ec976159cb01b4a40da3829ac2fd" },
56 + "schemastore.nvim": { "branch": "main", "commit": "d9fd6651b47b68bfc1b952f81a0fdded3cb205b2" },
57 57 "specs.nvim": { "branch": "main", "commit": "8a108c8b37dec1b184a1d3d76c6cf867bfbe9636" },
58 58 "speedtyper.nvim": { "branch": "main", "commit": "2d158eed4c753995b0501a3a7a72464fbb213e3d" },
59 59 "ssr.nvim": { "branch": "main", "commit": "bb323ba621ac647b4ac5638b47666e3ef3c279e1" },

neovim/lua/puck.lua

Added
new file mode 100644
1 +-- [x] Install tarballs into data dir
2 +-- [x] Put local plugins on runtimepath
3 +-- Generate helptags ALL
4 +-- project local plugin settings ?
5 +-- make this module async --> emit PuckDone event?
6 +-- Install treesitter parser into data dir
7 +-- Build parsers and put them where?
8 +-- vim.validate all input in functions
9 +--
10 +-- [x] Cache lua byte code? not necessary anymore thanks to vim.loader
12 +-- TODO export some kind of structure
13 +--
14 +local dev = 'plugin_under_development'
15 +local gh = 'plugin_from_github'
16 +local srht = 'plugin_from_srht'
17 +local cb = 'plugin_from_codeberg'
18 +local gh_format = 'https://github.com/%s/archive/%s.tar.gz'
19 +local cb_format = 'https://codeberg.org/%s/archive/%s.tar.gz'
20 +local srht_format = 'https://git.sr.ht/%s/archive/%s.tar.gz'
22 +local plugins = {}
24 +local as_name = function ( plugin_coords )
25 + return vim.fs.basename(plugin_coords):gsub( '(%w+)%.?%w*', '%1' )
26 +end
28 +local configure_plugin = function( plugin_name )
29 + local config = 'config.' .. plugin_name
30 + vim.schedule( function()
31 + local ok = pcall(require, config)
32 + if not ok then
33 + vim.notify(string.format('unable to load configuration for %s at %s', plugin_name, config), vim.log.levels.WARN)
34 + end
35 + end)
36 +end
38 +local download_plugin_into = function ( puck_root, plugin_name, plugin_tarball_url, plugin_install_path)
39 + vim.validate {
40 + puck_root = { puck_root, 'string' },
41 + plugin_name = { plugin_name, 'string'},
42 + plugin_tarball_url = { plugin_tarball_url, 'string' },
43 + plugin_install_path = { plugin_install_path, 'string'},
44 + }
46 + assert(vim.fn.executable 'curl', 'curl not found')
47 + assert(vim.fn.executable 'tar', 'tar not found')
49 + -- local tmp_dir = vim.uv.fs_mkdtemp(vim.fs.joinpath(vim.uv.os_tmpdir(),'puck_tmp_install_path_XXXXXX'))
50 + -- vim.fn.mkdir( plugin_install_path, 'p' )
52 + local tarball_data_stream = vim.uv.new_pipe(true)
54 + local curl_handle, curl_pid = vim.uv.spawn( 'curl',
55 + {
56 + args = { '--silent', '--location', plugin_tarball_url },
57 + cwd = puck_root,
58 + stdio = {nil, tarball_data_stream, nil},
59 + hide = true,
60 + },
61 + function(code, signal)
62 + if code ~= 0 then
63 + error('curl', code, signal)
64 + end
65 + end )
66 + local tar_handle, tar_pid = vim.uv.spawn( 'tar',
67 + {
68 + args = { '--extract','--gzip', '--file', '-' },
69 + cwd = puck_root,
70 + stdio = { tarball_data_stream, nil, nil},
71 + hide = true,
72 + },
73 + function(code, signal)
74 + if code ~= 0 then
75 + error('tar done', code, signal)
76 + end
78 + local contains_name = function(name, path) return name:find(plugin_name,0,true) end
79 + local extracted_dir = vim.fs.find( contains_name, { path = puck_root, type = 'directory', limit = 1 })
80 + assert(#extracted_dir ~= 0, 'No directory was found in tarball')
81 + assert(#extracted_dir == 1, 'Too many directories were found in tarball. Expected one!')
82 + -- FIXME: filter out files and folders, that are unnecessary for neovim plugins
83 + local ok = vim.uv.fs_rename(extracted_dir[1], plugin_install_path)
84 + assert(ok, string.format('Failed to move extracted plugin from %s to %s.', extracted_dir[1], plugin_install_path))
85 + configure_plugin(plugin_name)
86 + end )
88 + vim.uv.shutdown(tarball_data_stream, function()
89 + vim.uv.close(curl_handle)
90 + vim.uv.close(tar_handle)
91 + end)
92 +end
94 +local delete_directory_recursive = function ( path )
95 + local stat = vim.uv.fs_stat( path )
96 + if stat and stat.type == 'directory' then
97 + local dir = vim.uv.fs_scandir( path )
98 + if dir then
99 + while true do
100 + local name, type = vim.uv.fs_scandir_next( dir )
101 + if not name then
102 + break
103 + end
105 + local full_path = vim.fs.joinpath( path, name )
106 + if type == 'directory' then
107 + return delete_directory_recursive( full_path )
108 + else
109 + return vim.uv.fs_unlink( full_path )
110 + end
111 + end
112 + end
113 + return vim.uv.fs_rmdir( path )
114 + else
115 + return false
116 + end
118 + return true
119 +end
121 +local as_url_format = function(plugin_type)
122 + assert(plugin_type ~= dev, 'local plugins need not have an url format!')
123 + if plugin_type == gh then return gh_format end
124 + if plugin_type == cb then return cb_format end
125 + if plugin_type == srht then return srht_format end
127 + error('unknown plugin type '..plugin_type..' given.')
128 +end
130 +local install_plugin = function ( puck_root, plugin_type, plugin_coords, plugin_rev)
131 + local plugin_name = as_name( plugin_coords )
132 + local plugin_install_path = vim.fs.normalize( vim.fs.joinpath( puck_root, plugin_name ) )
133 + local plugin_install_path_stat = vim.uv.fs_stat( plugin_install_path )
134 + local plugin_already_exists = plugin_install_path_stat and plugin_install_path_stat.type == 'directory'
136 + local plugin_install_rev_path = vim.fs.normalize( vim.fs.joinpath(puck_root, plugin_name .. '.rev' ))
138 + -- either do nothing or update/fresh install
139 + if (vim.uv.fs_access( plugin_install_rev_path, 'R' )) then
140 + local plugin_install_rev_file = io.open( plugin_install_rev_path, 'r' )
141 + if not plugin_install_rev_file then vim.notify('Unable to read rev file ' .. plugin_install_rev_path, vim.log.levels.ERROR) end
142 + local current_rev = plugin_install_rev_file:read()
143 + plugin_install_rev_file:close()
144 + if current_rev == plugin_rev then
145 + configure_plugin(plugin_name)
146 + return
147 + end
148 + end
149 + -- rev is different, must be update (we don`t care if up or down) or fresh install
150 + local removed = delete_directory_recursive( plugin_install_path )
151 + local url_format = as_url_format(plugin_type)
152 + local plugin_tarball_url = url_format:format( plugin_coords, plugin_rev )
153 + download_plugin_into(puck_root, plugin_name, plugin_tarball_url, plugin_install_path, callback )
154 + local mode = vim.uv.fs_access(plugin_install_rev_path, 'W') and 'w+' or 'w'
155 + local plugin_install_rev_file = io.open( plugin_install_rev_path, mode)
156 + if not plugin_install_rev_file then vim.notify('Unable to write rev file ' .. plugin_install_rev_path, vim.log.levels.ERROR) end
157 + plugin_install_rev_file:write( plugin_rev )
158 + plugin_install_rev_file:close()
159 + if removed then
160 + vim.notify( 'Plugin ' .. plugin_coords .. '@' .. plugin_rev .. ' updated!', vim.log.levels.INFO )
161 + else
162 + vim.notify( 'Plugin ' .. plugin_coords .. '@' .. plugin_rev .. ' installed!', vim.log.levels.INFO )
163 + end
164 +end
166 +local delete_unused_plugins = function ( puck_root ) end
168 +local register_local_plugin = function ( workspace, plugin_coords )
169 + local plugin_path = vim.fs.normalize( vim.fs.joinpath(workspace, vim.fs.basename(plugin_coords) ) )
170 + local plugin_path_stat = vim.uv.fs_stat( plugin_path )
172 + if (plugin_path_stat and plugin_path_stat.type == 'directory') then
173 + vim.opt.runtimepath:prepend( plugin_path )
174 + else
175 + vim.notify( 'Failed to load local plugin ' .. plugin_path .. '!', vim.log.levels.ERROR )
176 + end
177 +end
179 +local load_local_plugin = function ( plugin_coords )
180 + local plugin_name = as_name( plugin_coords )
181 + local plugin_init = {}
182 + vim.tbl_extend( 'keep', plugin_init, vim.api.nvim_get_runtime_file( 'plugin/' .. plugin_name .. '.vim', false ) )
183 + vim.tbl_extend( 'keep', plugin_init, vim.api.nvim_get_runtime_file( 'plugin/' .. plugin_name .. '.lua', false ) )
184 + for _, init in pairs( plugin_init ) do
185 + vim.cmd.source( init )
186 + end
187 +end
189 +local load_registered_plugin = function ( plugin_name )
190 + vim.cmd.packadd(plugin_name)
191 + -- vim.cmd.helptags(plugin_name)
192 + return require(plugin_name)
193 +end
195 +local setup = function ( options )
196 + options = options or {}
197 + vim.validate {
198 + ['options.workspace'] = { options.workspace, 'string'},
201 + options.plugins = options.plugins or {}
202 + plugins = options.plugins
203 + -- take control of loading plugins.
204 + -- that means we have to take care of builtin plugins later
205 + vim.opt.loadplugins = false
207 + local puck_root = vim.fs.normalize( vim.fn.stdpath 'data' .. '/site/pack/puck/opt' )
208 + vim.fn.mkdir( puck_root, 'p' )
210 + for _, plugin in pairs( plugins ) do
211 + local plugin_type = plugin[1]
212 + local plugin_coords = plugin[2]
213 + local plugin_rev = plugin[3]
214 + if plugin_type == dev then
215 + register_local_plugin(options.workspace, plugin_coords )
216 + -- TODO def v plugins need configure too
217 + -- configure_plugin(plugin_name)
218 + else
219 + install_plugin( puck_root, plugin_type, plugin_coords, plugin_rev)
220 + end
221 + end
223 + delete_unused_plugins( puck_root )
225 + -- manually load builtin plugins, that we disabled earlier
226 + -- loads only a subset of builtins, that i find useful.
227 + load_local_plugin 'plugin/shada.vim'
228 + load_local_plugin 'plugin/tutor.vim'
229 + load_local_plugin 'plugin/spellfile.vim'
230 + load_local_plugin 'plugin/osc52.lua'
231 + -- can this be useful on win32?
232 + -- load_local_plugin 'plugin/man.lua'
233 + load_local_plugin 'plugin/editorconfig.lua'
234 +end
236 +return {
237 + -- FIXME: load needs to handle registerd and local plugin loading
238 + load = load_registered_plugin,
239 + setup = setup,
240 + plugin_types = {
241 + github = { type = gh, format = gh_format },
242 + codeberg = { type = cb, format = cb_format },
243 + sourcehut = { type = srht, format = srht_format },
244 + development = { type = dev, format = nil },
245 + },

neovim/puck.lua

Deleted
deleted file mode 100644
1 --- Install tarballs into data dir
2 --- Put local plugins on runtimepath
3 --- Generate helptags ALL
4 --- project local plugin settings ?
5 --- make this module async --> emit PuckDone event?
6 --- Install treesitter parser into data dir
7 --- Build parsers and put them where?
8 --- Cache lua byte code ?
10 ---FIXME: temp
11 -vim.opt.background = 'light'
12 -vim.cmd.colorscheme 'nugu'
14 --- TODO export some kind of structure
15 -local dev = 'plugin_under_development'
16 -local gh = 'plugin_from_github'
17 -local srht = 'plugin_from_srht'
18 -local cb = 'plugin_from_codeberg'
19 -local gh_format = 'https://github.com/%s/archive/%s.tar.gz'
20 -local cb_format = 'https://codeberg.org/%s/archive/%s.tar.gz'
21 -local srht_format = 'https://git.sr.ht/%s/archive/%s.tar.gz'
23 -local plugins = {}
25 -local as_name = function ( plugin_coords )
26 - return vim.fs.basename(plugin_coords):gsub( '(%w+)%.?%w*', '%1' )
27 -end
29 -local download_plugin_into = function ( plugin_name, plugin_tarball_url, plugin_install_path )
31 - assert(vim.fn.executable 'curl', 'curl not found')
32 - assert(vim.fn.executable 'tar', 'tar not found')
34 - local tmp_dir = vim.uv.fs_mkdtemp(vim.fs.joinpath(vim.uv.os_tmpdir(),'puck_tmp_install_path_XXXXXX'))
35 - -- vim.fn.mkdir( plugin_install_path, 'p' )
37 - local tarball_data_stream = vim.uv.new_pipe(true)
38 - local error_stream = vim.uv.new_pipe()
40 - vim.uv.read_start(error_stream, function(err, data)
41 - assert(not err, err)
42 - if data then vim.notify(data, vim.log.levels.ERROR) end
43 - end)
45 - local curl_handle, curl_pid = vim.uv.spawn( 'curl',
46 - {
47 - args = { '--silent', '--location', plugin_tarball_url },
48 - cwd = tmp_dir,
49 - stdio = {nil, tarball_data_stream, error_stream},
50 - hide = true,
51 - })
52 - -- function(code, signal)
53 - -- --TODO: error handle
54 - -- vim.print('curl done', code, signal)
55 - -- end )
56 - local tar_handle, tar_pid = vim.uv.spawn( 'tar',
57 - {
58 - args = { '--extract','--gzip', '--file', '-' },
59 - cwd = tmp_dir,
60 - stdio = { tarball_data_stream, nil, error_stream},
61 - hide = true,
62 - })
63 - -- function(code, signal)
64 - -- --TODO: error handle
65 - -- vim.print('tar done', code, signal)
66 - --
67 - -- -- move from tmp_dir to install_dir
68 - --
69 - -- end )
71 - vim.print(tmp_dir)
72 - local extracted_dir = vim.fs.find(
73 - function(name, path) return name:find(plugin_name,0,true) end,
74 - { path = tmp_dir, type = 'directory', limit = 1 }
75 - )
76 - vim.print(vim.inspect(extracted_dir))
77 - assert(#extracted_dir ~= 0, 'No directory was found in tarball')
78 - assert(#extracted_dir == 1, 'Too many directories were found in tarball. Expected one!')
79 - -- the libuv way of getting files accross partitions is PITA
80 - local ok = vim.fn.rename(extracted_dir[1], plugin_install_path)
81 - vim.print(ok)
82 - assert(ok, string.format('Failed to move extracted plugin from %s to %s.', extracted_dir[1], plugin_install_path))
84 - vim.uv.shutdown(tarball_data_stream, function()
85 - vim.uv.close(curl_handle, function()
86 - vim.print("curl closed")
87 - end)
88 - vim.uv.close(tar_handle, function()
89 - vim.print("tar closed")
90 - end)
91 - end)
92 -end
94 -local delete_directory_recursive = function ( path )
95 - local stat = vim.uv.fs_stat( path )
96 - if stat and stat.type == 'directory' then
97 - local dir = vim.uv.fs_scandir( path )
98 - if dir then
99 - while true do
100 - local name, type = vim.uv.fs_scandir_next( dir )
101 - if not name then
102 - break
103 - end
105 - local full_path = vim.fs.joinpath( path, name )
106 - if type == 'directory' then
107 - return delete_directory_recursive( full_path )
108 - else
109 - return vim.uv.fs_unlink( full_path )
110 - end
111 - end
112 - end
113 - return vim.uv.fs_rmdir( path )
114 - else
115 - return false
116 - end
118 - return true
119 -end
121 -local as_url_format = function(plugin_type)
122 - assert(plugin_type ~= dev, 'local plugins need not have an url format!')
123 - if plugin_type == gh then return gh_format end
124 - if plugin_type == cb then return cb_format end
125 - if plugin_type == srht then return srht_format end
127 - error('unknown plugin type '..plugin_type..' given.')
128 -end
130 -local install_plugin = function ( puck_root, plugin_type, plugin_coords, plugin_rev )
131 - local plugin_name = as_name( plugin_coords )
132 - local plugin_install_path = vim.fs.normalize( vim.fs.joinpath( puck_root, plugin_name ) )
133 - local plugin_install_path_stat = vim.uv.fs_stat( plugin_install_path )
134 - local plugin_already_exists = plugin_install_path_stat and plugin_install_path_stat.type == 'directory'
136 - local plugin_install_rev_path = vim.fs.normalize( vim.fs.joinpath(puck_root, plugin_name .. '.rev' ))
138 - -- either do nothing or update/fresh install
139 - if (vim.uv.fs_access( plugin_install_rev_path, 'R' )) then
140 - local plugin_install_rev_file = io.open( plugin_install_rev_path, 'r' )
141 - if not plugin_install_rev_file then vim.notify('Unable to read rev file ' .. plugin_install_rev_path, vim.log.levels.ERROR) end
142 - local current_rev = plugin_install_rev_file:read()
143 - plugin_install_rev_file:close()
144 - if current_rev == plugin_rev then return end
145 - end
146 - -- rev is different, must be update (we don`t care if up or down) or fresh install
147 - local removed = delete_directory_recursive( plugin_install_path )
148 - local url_format = as_url_format(plugin_type)
149 - local plugin_tarball_url = url_format:format( plugin_coords, plugin_rev )
150 - local ok = pcall( download_plugin_into, plugin_name, plugin_tarball_url, plugin_install_path )
151 - if ok then
152 - local mode = vim.uv.fs_access(plugin_install_rev_path, 'W') and 'w+' or 'w'
153 - local plugin_install_rev_file = io.open( plugin_install_rev_path, mode)
154 - if not plugin_install_rev_file then vim.notify('Unable to write rev file ' .. plugin_install_rev_path, vim.log.levels.ERROR) end
155 - plugin_install_rev_file:write( plugin_rev )
156 - plugin_install_rev_file:close()
157 - if removed then
158 - vim.notify( 'Plugin ' .. plugin_coords .. '@' .. plugin_rev .. ' updated!', vim.log.levels.INFO )
159 - else
160 - vim.notify( 'Plugin ' .. plugin_coords .. '@' .. plugin_rev .. ' installed!', vim.log.levels.INFO )
161 - end
162 - else
163 - vim.notify( 'Failed to download tarball for plugin ' .. plugin_coords .. '@' .. plugin_rev .. '!',
164 - vim.log.levels.ERROR )
165 - end
166 -end
168 -local delete_unused_plugins = function ( puck_root ) end
170 -local register_local_plugin = function ( workspace, plugin_coords )
171 - local plugin_path = vim.fs.normalize( vim.fs.joinpath(workspace, vim.fs.basename(plugin_coords) ) )
172 - local plugin_path_stat = vim.uv.fs_stat( plugin_path )
174 - if (plugin_path_stat and plugin_path_stat.type == 'directory') then
175 - vim.opt.runtimepath:prepend( plugin_path )
176 - else
177 - vim.notify( 'Failed to load local plugin ' .. plugin_path .. '!', vim.log.levels.ERROR )
178 - end
179 -end
181 -local load_local_plugin = function ( plugin_coords )
182 - local plugin_name = as_name( plugin_coords )
183 - local plugin_init = {}
184 - vim.tbl_extend( 'keep', plugin_init, vim.api.nvim_get_runtime_file( 'plugin/' .. plugin_name .. '.vim', false ) )
185 - vim.tbl_extend( 'keep', plugin_init, vim.api.nvim_get_runtime_file( 'plugin/' .. plugin_name .. '.lua', false ) )
186 - for _, init in pairs( plugin_init ) do
187 - vim.cmd.source( init )
188 - end
189 -end
191 -local load_registered_plugin = function ( plugin_name )
192 - -- TODO
193 -end
195 -local setup = function ( options )
196 - options = options or {}
197 - vim.validate { ['options.workspace'] = { options.workspace, 'string'}}
199 - options.plugins = options.plugins or {}
200 - plugins = options.plugins
201 - -- take control of loading plugins.
202 - -- that means we have to take care of builtin plugins later
203 - vim.opt.loadplugins = false
205 - local puck_root = vim.fs.normalize( vim.fn.stdpath 'data' .. '/site/pack/puck' )
206 - vim.fn.mkdir( puck_root, 'p' )
208 - for _, plugin in pairs( plugins ) do
209 - local plugin_type = plugin[1]
210 - local plugin_coords = plugin[2]
211 - local plugin_rev = plugin[3]
212 - if plugin_type == dev then
213 - register_local_plugin(options.workspace, plugin_coords )
214 - else
215 - install_plugin( puck_root, plugin_type, plugin_coords, plugin_rev )
216 - end
217 - end
219 - delete_unused_plugins( puck_root )
221 - -- manually load builtin plugins, that we disabled earlier
222 - -- loads only a subset of builtins, that i find useful.
223 - load_local_plugin 'plugin/shada.vim'
224 - load_local_plugin 'plugin/tutor.vim'
225 - load_local_plugin 'plugin/spellfile.vim'
226 - load_local_plugin 'plugin/osc52.lua'
227 - -- can this be useful on win32?
228 - -- load_local_plugin 'plugin/man.lua'
229 - load_local_plugin 'plugin/editorconfig.lua'
230 -end
232 --- TODO move this outside
233 --- testing the puck
234 -local plugins = {
235 - { dev, 'bugabinga/venn.nvim', },
236 - { gh, 'nyoom-engineering/oxocarbon.nvim', 'c5846d10cbe4131cc5e32c6d00beaf59cb60f6a2', },
237 - { srht, '~adigitoleo/haunt.nvim', 'e3e3c8f45663fed8225ba5efb0af00a2df14a736', },
238 - { cb, 'jthvai/lavender.nvim', 'a5187e6f4afe4b1f2fbcd0fe0bad34c40002ba48', },
239 - { dev, 'bugabinga/auto-dark-mode.nvim', nil, },
241 -setup { plugins = plugins, workspace = '~/Workspace'} -- TODO change Workspace on win32
242 -load_registered_plugin 'oxocarbon'
243 -vim.cmd.colorscheme 'oxocarbon'
245 -return {
246 - load = load_registered_plugin,
247 - setup = setup,

nushell/scripts/todo.nu

Modified
2 2 # Render my To-Do file in the terminal
3 3 export def main [] { mdcat ($env.NOTES | path join "TODO.md") }
5 5 # Open my To-Do file for editing
6 -export def edit [] { hx ($env.NOTES | path join "TODO.md") }
6 +export def edit [] { nvim ($env.NOTES | path join "TODO.md") }
8 8 # Open a list of commands, that I would like to remember to use
9 9 export def commands [] { mdcat ($env.NOTES | path join "COMMANDS.md") }
11 11 # Open the list of commands to remember for editing.
12 -export def "commands edit" [] { vim ($env.NOTES | path join "COMMANDS.md") }
12 +export def "commands edit" [] { nvim ($env.NOTES | path join "COMMANDS.md") }

systemd/environment.d/99_path.conf

Modified
1 -PATH=$CARGO_HOME/bin:$HOME/.local/bin:$PATH
1 +PATH=$CARGO_HOME/bin:$HOME/.local/bin:$HOME/go/bin:$PATH

topgrade/topgrade.linux.toml

Modified
44 44 "00 - Refresh Dotfiles" = "java ~/Workspace/dotfiles/bootstripper.java ~/Workspace/dotfiles"
46 46 # install tools from cargo, that are not already in path
47 -"01 - Install Cargo Tools" = "nu --env-config ~/.config/nushell/env.nu ~/Workspace/dotfiles/tools/cargo-tools.nu"
47 +"01 - Install Cargo Tools" = "cd ~/Workspace/dotfiles/tools ; java ~/Workspace/dotfiles/tools/install.java"

topgrade/topgrade.windows.toml

Modified
43 43 [commands]
44 44 "10 - Refresh dotfiles" = "java W:/dotfiles/bootstripper.java W:/dotfiles"
45 -"20 - Install Cargo Tools" = "nu --env-config ~/AppData/Roaming/nushell/env.nu W:/dotfiles/tools/cargo-tools.nu"
45 +"20 - Install Cargo Tools" = "cd ~/Workspaces/dotfiles/tools ; java ~/Workspaces/dotfiles/tools/install.java"
46 46 "30 - Advantage-PM Client" = "nu X:/update_apm_client.nu"
47 47 "31 - MeMate" = "nu X:/update_memate.nu"
48 48 "40 - TLDR" = "tldr --update"

velma.symlinks

Deleted
deleted file mode 100644
1 -git/gitconfig
2 -~/.config/git/config
4 -git/gitconfig.linux
5 -~/.config/git/.gitconfig.include
7 -subversion/config
8 -~/.subversion/config
10 -subversion/diff
11 -~/.subversion/diff
13 -subversion/diff3
14 -~/.subversion/diff3
16 -subversion/merge
17 -~/.subversion/merge
19 -tools/git-info
20 -~/.local/bin/git-info
22 -cargo/config.toml
23 -~/.cargo/config.toml
25 -bat/config
26 -~/.config/bat/config
28 -nushell/config.nu
29 -~/.config/nushell/config.nu
31 -nushell/env.nu
32 -~/.config/nushell/env.nu
34 -nushell/modules
35 -~/.config/nushell/modules
37 -nushell/plugin.nu
38 -~/.config/nushell/plugin.nu
40 -stackoverflow/so
41 -~/.config/so
43 -topgrade/topgrade.linux.toml
44 -~/.config/topgrade.toml
46 -indexa/config.linux.toml
47 -~/.config/indexa/config.toml
49 -wezterm
50 -~/.config/wezterm
52 -wezterm/wezterm.service
53 -~/.config/systemd/user/wezterm.service
55 -helix/config.toml
56 -~/.config/helix/config.toml
58 -helix/languages.toml
59 -~/.config/helix/languages.toml
61 -helix/themes
62 -~/.config/helix/themes
64 -helix/systemd/helix-dark-mode.service
65 -~/.config/systemd/user/helix-dark-mode.service
67 -xplr
68 -~/.config/xplr
70 -ssh/config
71 -~/.ssh/config
73 -neovim
74 -~/.config/nvim
76 -river
77 -~/.config/river

wezterm/nerdfonts

Modified
15 15 Hack
16 16 Hasklig
17 17 Hermit
18 -IBM 3270
18 +# IBM 3270
19 19 IBM Plex Mono
20 20 # Inconsolata
21 21 Intel One Mono

wezterm/wezterm.lua

Modified
106 106 -- unix_domains = { { name = 'mux' } },
107 107 -- default_gui_startup_args = { 'connect', 'mux' },
109 + -- testing, if there is a feelable diff
110 + front_end = 'WebGpu',
111 + -- refresh rate of my displays. TODO: move this to host config
112 + max_fps = 144,
109 114 font = font,
110 115 font_size = font_size,
111 116 freetype_load_target = 'Light',