Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
jmbuhr committed Oct 30, 2024
2 parents 50faaaa + c27c052 commit 37765ba
Show file tree
Hide file tree
Showing 18 changed files with 862 additions and 249 deletions.
29 changes: 29 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,34 @@
# Changelog

## [3.11.0](https://github.com/jmbuhr/quarto-nvim-kickstarter/compare/v3.10.0...v3.11.0) (2024-07-05)


### Features

* use telescope for some lsp handlers ([f1a04a5](https://github.com/jmbuhr/quarto-nvim-kickstarter/commit/f1a04a56be42e6e24c0af93b3d600653138f7988))

## [3.10.0](https://github.com/jmbuhr/quarto-nvim-kickstarter/compare/v3.9.0...v3.10.0) (2024-06-29)


### Features

* json ls ([887f798](https://github.com/jmbuhr/quarto-nvim-kickstarter/commit/887f7986091c386fba8d44f0414930250b4022d5))

## [3.9.0](https://github.com/jmbuhr/quarto-nvim-kickstarter/compare/v3.8.1...v3.9.0) (2024-05-18)


### Features

* kanagawa colorscheme ([a9995a0](https://github.com/jmbuhr/quarto-nvim-kickstarter/commit/a9995a0cecc5f16a041c1b5259b99bb91a8b6cdd))
* oil.nvim to edit the filesystem as a buffer ([69b73eb](https://github.com/jmbuhr/quarto-nvim-kickstarter/commit/69b73ebb52ab5f794af31fa345aa590137045771))
* virtual text for dap ([1bdaab3](https://github.com/jmbuhr/quarto-nvim-kickstarter/commit/1bdaab3f54ee03084e291bb7cf1b2fab37f7401a))


### Bug Fixes

* full screen image preview ([ef0bbee](https://github.com/jmbuhr/quarto-nvim-kickstarter/commit/ef0bbeee56434969a8c0c4cec86527a6e820c199))
* no signcolumn for terminal windows ([bb3fa64](https://github.com/jmbuhr/quarto-nvim-kickstarter/commit/bb3fa644d6516b4fc060042c74878f1af81d0774))

## [3.8.1](https://github.com/jmbuhr/quarto-nvim-kickstarter/compare/v3.8.0...v3.8.1) (2024-05-13)


Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ sudo apt install imagemagick
sudo apt install libmagickwand-dev
sudo apt install liblua5.1-0-dev
sudo apt install luajit
sudo apt install tree-sitter-cli
```

Manually installing luarocks and the magick rock is no longer required, this is handled by [luarocks.nvim](https://github.com/vhyrro/luarocks.nvim).
Expand Down
25 changes: 25 additions & 0 deletions after/queries/python/injections.scm
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
; extends
((call
function: (identifier) @function_name (#eq? @function_name "Style")
arguments: (argument_list
(string
(string_content) @injection.content)))

(#set! injection.language "css"))

((call
function: (identifier) @function_name (#eq? @function_name "Script")
arguments: (argument_list
(string
(string_content) @injection.content)))

(#set! injection.language "javascript"))

((call
function: (identifier) @function_name (#eq? @function_name "On")
arguments: (argument_list

(string
(string_content) @injection.content))

(#set! injection.language "javascript")))
2 changes: 2 additions & 0 deletions ftplugin/python.lua
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
vim.b.slime_cell_delimiter = '#\\s\\=%%'

require("otter").activate()
6 changes: 6 additions & 0 deletions init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,9 @@
require 'config.global'
require 'config.lazy'
require 'config.autocommands'
require 'config.redir'


vim.treesitter.language.add('pandoc_markdown', { path = "/usr/local/lib/libtree-sitter-pandoc-markdown.so" })
vim.treesitter.language.add('pandoc_markdown_inline', { path = "/usr/local/lib/libtree-sitter-pandoc-markdown-inline.so" })
vim.treesitter.language.register('pandoc_markdown', { 'quarto', 'rmarkdown' })
2 changes: 2 additions & 0 deletions lua/config/global.lua
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ vim.diagnostic.config {
vim.filetype.add {
extension = {
ojs = 'javascript',
pyodide = 'python',
webr = 'r',
},
}

Expand Down
Loading

0 comments on commit 37765ba

Please sign in to comment.