diff --git a/lua/core/abbrevs.lua b/lua/core/abbrevs.lua index c5b3289..b4d375d 100644 --- a/lua/core/abbrevs.lua +++ b/lua/core/abbrevs.lua @@ -3,3 +3,8 @@ vim.keymap.set("ca", "w'", "w") vim.keymap.set("ca", "REst", "Rest") vim.keymap.set("ca", "FOrmat", "Format") vim.keymap.set("ca", "ROcks", "Rocks") + +vim.cmd[[ +inoreabbrev Hanlder Handler +inoreabbrev sapce space +]] diff --git a/lua/core/options.lua b/lua/core/options.lua index 5ba0a3e..051e373 100644 --- a/lua/core/options.lua +++ b/lua/core/options.lua @@ -1,7 +1,6 @@ vim.env.LANG = "en_US.UTF-8" vim.o.foldexpr = "v:lua.vim.treesitter.foldexpr()" -vim.opt.diffopt:append("linematch:60") vim.o.clipboard = "unnamedplus" vim.o.cmdheight = 1 -- due to stevearc/quicker.nvim#21 issue diff --git a/lua/plugins/fzf-lua.lua b/lua/plugins/fzf-lua.lua index b9a3ccd..fa236d0 100644 --- a/lua/plugins/fzf-lua.lua +++ b/lua/plugins/fzf-lua.lua @@ -39,6 +39,7 @@ local function find_dirs(opts) end vim.keymap.set("n", "", "FzfLua helptags") +vim.keymap.set("n", "p", "FzfLua") vim.keymap.set("n", ",", "FzfLua buffers") vim.keymap.set("n", "e", "FzfLua files") vim.keymap.set("n", "ff", "FzfLua files") diff --git a/lua/plugins/rest.lua b/lua/plugins/rest.lua index d2dbc1a..6d6bcd1 100644 --- a/lua/plugins/rest.lua +++ b/lua/plugins/rest.lua @@ -7,5 +7,12 @@ vim.g.rest_nvim = { highlight = { timeout = 250, }, + ui = { + -- panes = require("rest-nvim.ui.panes.preset.browser"), + }, _log_level = vim.log.levels.DEBUG, } +local ok, browser = pcall(require, "rest-nvim.ui.panes.preset.browser") +if ok then + vim.g.rest_nvim.ui = browser +end diff --git a/lua/plugins/zeta.lua b/lua/plugins/zeta.lua new file mode 100644 index 0000000..7995f97 --- /dev/null +++ b/lua/plugins/zeta.lua @@ -0,0 +1,10 @@ +vim.keymap.set("n", "\\", function() + vim.notify("zeta.autocmd.setup()") + require("zeta.autocmd").setup() +end) +vim.keymap.set("n", "gy", "(zeta-accept)") +vim.keymap.set("i", "", "(zeta-accept)") + +vim.g.zeta_nvim = { + _log_level = vim.log.levels.DEBUG, +} diff --git a/rocks.toml b/rocks.toml index 420033f..64f9399 100644 --- a/rocks.toml +++ b/rocks.toml @@ -15,23 +15,23 @@ nvim-nio = "1.10.1" # If the plugin name contains a dot then you must add quotes to the key name! [plugins] "rocks.nvim" = "2.43.1" -"rocks-git.nvim" = "2.5.2" +"rocks-git.nvim" = "2.5.3" "rocks-dev.nvim" = "1.7.0" "rocks-config.nvim" = "3.1.0" "rocks-lazy.nvim" = "1.2.0" "rocks-edit.nvim" = "scm" "rocks-treesitter.nvim" = "1.3.0" -nvim-lspconfig = "1.6.0" +nvim-lspconfig = "1.7.0" "indent-blankline.nvim" = "3.8.7" "conform.nvim" = "9.0.0" -"fidget.nvim" = "1.4.1" +"fidget.nvim" = "1.6.0" luasnip = { version = "2.3.0", event = "InsertEnter" } neogit = { version = "scm", cmd = "Neogit" } "kanagawa.nvim" = "scm" # "mini.ai" = "scm" nvim-surround = "2.1.5" -fzf-lua = { version = "0.0.1764" } +fzf-lua = { version = "0.0.1783" } "quicker.nvim" = "1.4.0" "telescope.nvim" = "scm" "octo.nvim" = { version = "scm", cmd = "Octo", event = "BufReadCmd octo://*" } @@ -55,27 +55,27 @@ tree-sitter-groovy = "0.0.33" tree-sitter-html = "0.0.36" tree-sitter-html_tags = "0.0.10" tree-sitter-hurl = "0.0.30" -tree-sitter-ini = "0.0.29" +tree-sitter-ini = "0.0.30" tree-sitter-javascript = "0.0.36" tree-sitter-json = "0.0.36" tree-sitter-jsonc = "0.0.29" tree-sitter-jsx = "0.0.10" tree-sitter-kotlin = "0.0.32" tree-sitter-lua = "0.0.33" -tree-sitter-make = "0.0.29" -tree-sitter-nix = "0.0.56" +tree-sitter-make = "0.0.30" +tree-sitter-nix = "0.0.59" tree-sitter-query = "0.0.34" tree-sitter-regex = "0.0.40" -tree-sitter-rust = "0.0.41" +tree-sitter-rust = "0.0.47" tree-sitter-swift = "0.0.46" tree-sitter-templ = "0.0.45" tree-sitter-tmux = "0.0.29" tree-sitter-toml = "0.0.31" tree-sitter-tsx = "0.0.35" -tree-sitter-typescript = "0.0.36" +tree-sitter-typescript = "0.0.37" tree-sitter-vimdoc = "0.0.31" tree-sitter-vue = "0.0.29" -tree-sitter-xml = "0.0.36" +tree-sitter-xml = "0.0.37" tree-sitter-yaml = "0.0.32" "diffview.nvim" = "scm" @@ -83,13 +83,13 @@ tree-sitter-yaml = "0.0.32" "crates.nvim" = { version = "0.5.2", event = "BufRead" } "leap.nvim" = "scm" "gitsigns.nvim" = "1.0.1" -tree-sitter-dart = "0.0.34" -tree-sitter-sql = "0.0.39" +tree-sitter-dart = "0.0.35" +tree-sitter-sql = "0.0.40" # nvim-treesitter-legacy-api = "0.9.2" neorg = "9.2.0" -"markview.nvim" = "25.3.1" +"markview.nvim" = "25.4.0" "cloak.nvim" = "scm" -tree-sitter-http = "0.0.35" +tree-sitter-http = "0.0.33" showkeys = "dev" tree-sitter-bash = "0.0.40" "nui.nvim" = "0.3.0" @@ -97,11 +97,9 @@ github-nvim-theme= "1.1.2" vim-suda= "v1.2.4" luautf8 = "0.1.6" -"sense.nvim" = { dir = "~/projects/sense.nvim/" } -[plugins."rest.nvim"] -dir = "~/repo/rest.nvim/" -[plugins."zeta.nvim"] -dir = "~/projects/zeta.nvim/" +"sense.nvim" = "1.0.1" +"rest.nvim"= "3.12.0" +"zeta.nvim"= "rocksdev" # [plugins."xcodebuild.nvim"] # git = "wojciech-kulik/xcodebuild.nvim" diff --git a/todo.norg b/todo.norg index 876c181..3aa2c97 100644 --- a/todo.norg +++ b/todo.norg @@ -17,3 +17,4 @@ - ( ) `o_ii` to select range by indents - ( ) [substitute.nvim]{https://github.com/gbprod/substitute.nvim}. Maybe map to `xX` - ( ) ditch global `q` mapping for `q/` and stuffs +- ( ) {https://neovim.io/doc/user/options.html#'exrc'}['exrc']