Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/utensil/forest
Browse files Browse the repository at this point in the history
  • Loading branch information
@utensil
utensil committed Nov 3, 2024
2 parents d07e6d5 + 19160c6 commit bf856d3
Show file tree
Hide file tree
Showing 9 changed files with 116 additions and 14 deletions.
4 changes: 2 additions & 2 deletions assets/article.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- SPDX-License-Identifier: CC0-1.0 -->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:f="http://www.jonmsterling.com/foreign-forester-jms-005P.xml">
xmlns:f="http://www.jonmsterling.com/jms-005P.xml">

<xsl:output method="text" encoding="utf-8" indent="yes" doctype-public="" doctype-system="" />

Expand Down Expand Up @@ -102,4 +102,4 @@
<xsl:text>}</xsl:text>
</xsl:template>

</xsl:stylesheet>
</xsl:stylesheet>
4 changes: 2 additions & 2 deletions assets/book.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- SPDX-License-Identifier: CC0-1.0 -->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:f="http://www.jonmsterling.com/foreign-forester-jms-005P.xml">
xmlns:f="http://www.jonmsterling.com/jms-005P.xml">

<xsl:output method="text" encoding="utf-8" indent="yes" doctype-public="" doctype-system="" />

Expand Down Expand Up @@ -75,4 +75,4 @@
<xsl:text>}</xsl:text>
</xsl:template>

</xsl:stylesheet>
</xsl:stylesheet>
4 changes: 2 additions & 2 deletions assets/community-overrides.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:beamer="http://ctan.org/pkg/beamer"
xmlns:indenting="jonmsterling:indenting"
xmlns:f="http://www.jonmsterling.com/foreign-forester-jms-005P.xml"
xmlns:f="http://www.jonmsterling.com/jms-005P.xml"
>

<!-- From https://git.sr.ht/~jonsterling/forest-assets/tree/main/item/jms-forest.xsl -->
Expand All @@ -31,4 +31,4 @@

<!-- See also https://github.com/CAIMEOX/caimeox.github.io/blob/main/theme/forest.xsl -->

</xsl:stylesheet>
</xsl:stylesheet>
4 changes: 2 additions & 2 deletions assets/latex.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns:f="http://www.jonmsterling.com/foreign-forester-jms-005P.xml">
xmlns:f="http://www.jonmsterling.com/jms-005P.xml">

<xsl:template match="/f:tree/f:backmatter//f:tree[f:frontmatter/f:taxon[text()='Reference']]">
<xsl:apply-templates select="f:frontmatter/f:meta[@name='bibtex']" />
Expand Down Expand Up @@ -403,4 +403,4 @@
<xsl:template match="html:span[@class='webonly']">
</xsl:template>

</xsl:stylesheet>
</xsl:stylesheet>
4 changes: 2 additions & 2 deletions assets/uts-forest.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:beamer="http://ctan.org/pkg/beamer"
xmlns:indenting="jonmsterling:indenting"
xmlns:f="http://www.jonmsterling.com/foreign-forester-jms-005P.xml"
xmlns:f="http://www.jonmsterling.com/jms-005P.xml"
>

<!-- The imports must be the first elements in the stylesheet -->
Expand All @@ -26,4 +26,4 @@

<xsl:output method="html" encoding="utf-8" indent="yes" doctype-public="" doctype-system="" />

</xsl:stylesheet>
</xsl:stylesheet>
2 changes: 1 addition & 1 deletion assets/uts-layout.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:beamer="http://ctan.org/pkg/beamer"
xmlns:indenting="jonmsterling:indenting"
xmlns:f="http://www.jonmsterling.com/foreign-forester-jms-005P.xml"
xmlns:f="http://www.jonmsterling.com/jms-005P.xml"
>

<!-- The following is based on https://git.sr.ht/~jonsterling/forester-base-theme/tree/main/item/tree.xsl -->
Expand Down
2 changes: 1 addition & 1 deletion assets/uts-overrides.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:beamer="http://ctan.org/pkg/beamer"
xmlns:indenting="jonmsterling:indenting"
xmlns:f="http://www.jonmsterling.com/foreign-forester-jms-005P.xml"
xmlns:f="http://www.jonmsterling.com/jms-005P.xml"
xmlns:html="http://www.w3.org/1999/xhtml"
>

Expand Down
37 changes: 36 additions & 1 deletion justfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,17 @@ prep-term: prep-kitty
which nnn || brew install nnn
which stylua || brew install stylua
which sd || brew install sd
which dua || brew install dua-cli
which bat || brew install bat
which eza || brew install eza
which rg || brew install ripgrep
which rip || brew install rm-improved
which luarocks || brew install luarocks
# luarocks --local --lua-version=5.1 install magick
which starship || brew install starship
which z || brew install zoxide
which imagemagick ||brew install imagemagick
grep -F 'eval "$(zoxide init zsh)"' ~/.zshrc|| echo 'eval "$(zoxide init zsh)"' >> ~/.zshrc
# grep ~/.bashrc -F 'eval "$(starship init bash)"' || echo 'eval "$(starship init bash)"' >> ~/.bashrc
grep -F 'eval "$(starship init zsh)"' ~/.zshrc || echo 'eval "$(starship init zsh)"' >> ~/.zshrc

Expand Down Expand Up @@ -136,6 +145,10 @@ sync-lazyvim: stylua
cp -f uts-plugins.lua ~/.config/nvim/lua/plugins/spec.lua
cp -f lazyvim-cmp.lua ~/.config/nvim/lua/plugins/lazyvim-cmp.lua

sync-nvchad: stylua
mkdir -p ~/.config/nvim/lua/plugins
cp -f uts-plugins.lua ~/.config/nvim/lua/plugins/spec.lua

prep-nvim: prep-term
#!/usr/bin/env bash
which nvim || brew install neovim
Expand Down Expand Up @@ -176,6 +189,19 @@ lazyvim PROJ="forest": sync-lazyvim
#!/usr/bin/env bash
cd ~/projects/{{PROJ}} && nvim --cmd 'set runtimepath+=~/.config/lazyvim/' -u ~/.config/lazyvim/lazyvim-init.lua .
prep-nvchad:
#!/usr/bin/env bash
if [ -d ~/.config/nvchad ]; then
(cd ~/.config/nvchad && git pull)
else
git clone https://github.com/NvChad/starter ~/.config/nvchad
fi

nvchad PROJ="forest": sync-nvchad
#!/usr/bin/env bash
cd ~/projects/{{PROJ}} && nvim --cmd 'set runtimepath+=~/.config/nvchad/' --cmd 'lua package.path = package.path .. ";{{home_directory()}}/.config/nvchad/lua/?.lua"' -u ~/.config/nvchad/init.lua .
# https://github.com/astral-sh/uv

[unix]
Expand Down Expand Up @@ -242,8 +268,17 @@ prep-amethyst:
# ./act.sh

prep-monit:
#!/usr/bin/env bash
which btop || brew install btop
which macmon || brew install vladkens/tap/macmon
# which glances || brew install glances
if [ "$(uname)" == "Darwin" ]; then
if [ "$(uname -m)" == "aarch64" ]; then
which macmon || brew install vladkens/tap/macmon
# which neoasitop || (brew tap op06072/neoasitop && brew install neoasitop)
else
echo "No GPU monit tools found yet"
fi
fi
rec:
uvx asciinema rec
69 changes: 68 additions & 1 deletion uts-plugins.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ local plugins = {
{
"kentookura/forester.nvim",
-- before = { "nvim-cmp" },
branch = "36-installation-and-initialization",
-- branch = "36-installation-and-initialization",
-- tried removing this for the auto-completion to have a non-nil `forester_current_config`
event = "VeryLazy",
dependencies = {
Expand Down Expand Up @@ -627,6 +627,73 @@ local plugins = {
position = "top-right",
},
},
{
"MeanderingProgrammer/render-markdown.nvim",
dependencies = { "nvim-treesitter/nvim-treesitter", "echasnovski/mini.nvim" }, -- if you use the mini.nvim suite
-- dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.icons' }, -- if you use standalone mini plugins
-- dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons
---@module 'render-markdown'
---@type render.md.UserConfig
opts = {
enable = true,
render_modes = true,
-- heading = {
-- backgrounds = {
-- "RenderMarkdownH1Bg",
-- "RenderMarkdownH2Bg",
-- "RenderMarkdownH3Bg",
-- "RenderMarkdownH4Bg",
-- "RenderMarkdownH5Bg",
-- "RenderMarkdownH6Bg",
-- },
-- },
},
ft = { "markdown", "quarto" },
},
-- {
-- "3rd/image.nvim",
-- config = function()
-- require("image").setup {
-- -- processor = "magick_cli",
-- }
-- end,
-- },
{
"vhyrro/luarocks.nvim",
priority = 1001, -- this plugin needs to run before anything else
opts = {
rocks = { "magick" },
},
},
{
"3rd/image.nvim",
dependencies = { "luarocks.nvim" },
config = function()
require("image").setup {
processor = "magick_cli",
integrations = {
markdown = {
filetypes = { "markdown", "vimwiki", "quarto", "forester" },
only_render_image_at_cursor = true,
},
},
}
-- ...
end,
},
-- {
-- "ThePrimeagen/harpoon",
-- branch = "harpoon2",
-- dependencies = { "nvim-lua/plenary.nvim" },
-- },
-- {
-- "dnlhc/glance.nvim",
-- config = function()
-- require("glance").setup {
-- -- your configuration
-- }
-- end,
-- },

-- {
-- "Zeioth/hot-reload.nvim",
Expand Down

0 comments on commit bf856d3

Please sign in to comment.