diff options
| -rw-r--r-- | .config/nvim/init.lua | 81 | ||||
| -rw-r--r-- | .local/share/meson/native/.gcc.txt.un~ | bin | 0 -> 3590 bytes | |||
| -rw-r--r-- | .local/share/meson/native/gcc.txt | 4 | ||||
| -rw-r--r-- | .zfunc/set-title | 10 |
4 files changed, 82 insertions, 13 deletions
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index a017a27..dc977a9 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -14,6 +14,7 @@ require "paq" { { 'hrsh7th/nvim-cmp' }, { 'hrsh7th/cmp-nvim-lsp' }, { "stevearc/conform.nvim" }, + { 'stevearc/dressing.nvim' }, { "j-hui/fidget.nvim" }, }:sync() @@ -51,6 +52,9 @@ vim.opt.showtabline = 2 -- Bug in Wayland + netrw -- vim.opt.clipboard = 'unnamedplus' +vim.keymap.set({ 'n', 'x' }, '<leader>y', '"+y') +vim.keymap.set('n', '<leader>p', '"+p') +vim.keymap.set('x', '<leader>p', '"+P') vim.cmd.colorscheme 'melange' vim.opt.colorcolumn = '+1' @@ -178,6 +182,73 @@ require 'nvim-treesitter.configs'.setup { auto_install = true, } +function Set(list) + local set = {} + for _, l in ipairs(list) + do + set[l] = true + end + return set +end + +function Filepicker(dir) + vim.fs.normalize(dir) + local function action(result) + if result[2] == "directory" then + Filepicker(result[1]) + elseif result[2] == "link" + then + action({ result[3], result[4] }) + else + vim.cmd("edit " .. result[1]) + end + end + local function format(tbl) + if tbl[2] == "directory" then + return tbl[1] .. "/" + elseif tbl[2] == "link" then + return tbl[1] .. " -> " .. format({ tbl[3], tbl[4] }) + else + return tbl[1] + end + end + local file_iter = vim.iter(vim.fs.dir(dir, { depth = 1 })) + local files = file_iter:totable() + table.insert(files, 1, {"..", "link"}) + files = vim.tbl_map(function(tbl) + if tbl[2] == "link" then + local path = vim.fs.joinpath(dir, tbl[1]) + tbl[#tbl + 1] = vim.uv.fs_realpath(path) + if tbl[3] then + tbl[#tbl + 1] = vim.uv.fs_stat(tbl[3]).type + else + tbl[#tbl + 1] = "broken" + end + end + return tbl + end, files) + files = vim.tbl_filter(function(tbl) + if tbl[2] == "link" then + return Set { "file", "directory" }[tbl[4]] + else + return Set { "file", "directory" }[tbl[2]] + end + end, files) + vim.ui.select(files, { + prompt = 'Open: ', + format_item = format + }, function(result) + if result then + result[1] = vim.fs.joinpath(dir, result[1]) + action(result) + end + end) +end + +vim.keymap.set('n', '<leader>o', function() + Filepicker(vim.fn.getcwd()) +end) + vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist) require("conform").setup { @@ -201,14 +272,6 @@ vim.api.nvim_create_user_command("Format", function(args) require("conform").format({ async = true, lsp_format = "fallback", range = range }) end, { range = true }) -vim.api.nvim_create_user_command("Scratch", function(args) - local buf = vim.api.nvim_create_buf(true, true) - print(vim.inspect(args)) - if #args.fargs then - vim.api.nvim_buf_set_name(buf, args.fargs[1]) - end -end, { nargs = '?', bar = true }) - vim.keymap.set('n', '<leader>b', function() local bufs = vim.tbl_filter( function(buffer) @@ -263,7 +326,7 @@ vim.api.nvim_create_autocmd('LspAttach', { end, opts) vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, opts) vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, opts) - vim.keymap.set({ 'n', 'v' }, '<space>ca', vim.lsp.buf.code_action, opts) + vim.keymap.set({ 'n', 'v' }, '<leader>ca', vim.lsp.buf.code_action, opts) vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts) vim.lsp.inlay_hint.enable() diff --git a/.local/share/meson/native/.gcc.txt.un~ b/.local/share/meson/native/.gcc.txt.un~ Binary files differnew file mode 100644 index 0000000..a2f3d9d --- /dev/null +++ b/.local/share/meson/native/.gcc.txt.un~ diff --git a/.local/share/meson/native/gcc.txt b/.local/share/meson/native/gcc.txt index f9d73f2..fef0ea0 100644 --- a/.local/share/meson/native/gcc.txt +++ b/.local/share/meson/native/gcc.txt @@ -1,4 +1,8 @@ [binaries] c = 'gcc' cpp = 'g++' +c_ld = 'bfd' +cpp_ldd = 'bfd' +ar = 'ar' +strip = 'strip' diff --git a/.zfunc/set-title b/.zfunc/set-title index ae46b5a..cba1aeb 100644 --- a/.zfunc/set-title +++ b/.zfunc/set-title @@ -1,10 +1,12 @@ #!zsh emulate -L zsh -if tput hs +zmodload zsh/terminfo + +if [[ $teminfo[hs] == "yes" ]] then - tsl="$(tput tsl)" - fsl="$(tput fsl)" + tsl="$terminfo[tsl]" + fsl="$terminfo[fsl]" hs=1 else case ${TERM} in @@ -21,7 +23,7 @@ else esac fi -if test "$hs" = 1 +if [[ "$hs" == 1 ]] then printf "%s" "$tsl" printf "%s" "$@" |