From 0ab1f77979b93be0ff516b9c3c3bfadc6308fae4 Mon Sep 17 00:00:00 2001 From: GitHub Date: Thu, 17 Feb 2022 00:29:19 +0000 Subject: [PATCH 1/7] [dmitmel] Update submodule --- dmitmel-dotfiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dmitmel-dotfiles b/dmitmel-dotfiles index 9e6941e..f1a9b55 160000 --- a/dmitmel-dotfiles +++ b/dmitmel-dotfiles @@ -1 +1 @@ -Subproject commit 9e6941eeb7728f0ceadffb501f473a08837098ac +Subproject commit f1a9b55666c97cac78f40afc395f47246811d350 From f0b537a486cc0b4dc74b5e68384b0a5447139d0c Mon Sep 17 00:00:00 2001 From: Alyxia Sother Date: Thu, 17 Feb 2022 10:15:51 +0100 Subject: [PATCH 2/7] [nvim] Wrap more plugin configs in pcalls --- nvim/plugin/lualine.lua | 8 +++++--- nvim/plugin/neorg.lua | 10 +++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/nvim/plugin/lualine.lua b/nvim/plugin/lualine.lua index d281582..04ff373 100644 --- a/nvim/plugin/lualine.lua +++ b/nvim/plugin/lualine.lua @@ -1,5 +1,7 @@ -local dotfiles_gruv = require'lualine.themes.gruvbox' -local theme = require'dotfiles.colorscheme' +local dotfiles_gruv = require('lualine.themes.gruvbox') +local theme = require('dotfiles.colorscheme') +local ok, lualine = pcall(require, 'lualine') +if not ok then return end; -- https://github.com/dmitmel/dotfiles/commit/bf96e553764e3a166286f5a6a8017e01dadcf6f9 -- https://ptb.discord.com/channels/382339402338402315/382339402338402317/885864846892077086 @@ -37,7 +39,7 @@ local function showBoard() end end -require('lualine').setup{ +lualine.setup{ options = { theme = dotfiles_gruv } diff --git a/nvim/plugin/neorg.lua b/nvim/plugin/neorg.lua index e655840..2e0a9af 100644 --- a/nvim/plugin/neorg.lua +++ b/nvim/plugin/neorg.lua @@ -1,14 +1,14 @@ -local ok, neorg = pcall(require, 'neorg') -if not ok then return end; +local okn, neorg = pcall(require, 'neorg') +if not okn then return end; -local ok, cmp = pcall(require, 'cmp') -if not ok then return end; +local okc, cmp = pcall(require, 'cmp') +if not okc then return end; local cmp_config = cmp.get_config() table.insert(cmp_config.sources, { name = "neorg" }) cmp.setup(cmp_config) -require('neorg').setup { +neorg.setup { load = { ["core.defaults"] = {}, ["core.norg.concealer"] = {}, From 74ebb5346c6b37b09d61962f1e5e84fd4945efbd Mon Sep 17 00:00:00 2001 From: Alyxia Sother Date: Thu, 17 Feb 2022 11:51:12 +0100 Subject: [PATCH 3/7] [nvim] Add syntax/ftdetect for Melody files --- nvim/ftdetect/dotfiles.vim | 1 + nvim/syntax/melody.vim | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 nvim/syntax/melody.vim diff --git a/nvim/ftdetect/dotfiles.vim b/nvim/ftdetect/dotfiles.vim index c120a2d..895712f 100644 --- a/nvim/ftdetect/dotfiles.vim +++ b/nvim/ftdetect/dotfiles.vim @@ -7,4 +7,5 @@ augroup dotfilesftdetect autocmd BufNewFile,BufRead *.dream setf dream autocmd BufNewFile,BufRead *.newlisp setf newlisp + autocmd BufNewFile,BufRead *.mdy setf melody augroup END diff --git a/nvim/syntax/melody.vim b/nvim/syntax/melody.vim new file mode 100644 index 0000000..6423096 --- /dev/null +++ b/nvim/syntax/melody.vim @@ -0,0 +1,12 @@ +" Syntax highlighting for *.mdy files. +syntax match melodyKeyword '\v(char|of|capture|to|of|some|start|end|match)' +syntax match melodyConstant '\v\<(.*)\>' +syntax match melodyNum '\v\d+' +syntax match melodyComment '\v\/\/.*' +syntax match melodyString '\v\"(.*)\"' + +hi def link melodyKeyword Statement +hi def link melodyConstant Constant +hi def link melodyNum Number +hi def link melodyComment Comment +hi def link melodyString String From 361a5e5bd271f9975f05177baa6b281713a20f34 Mon Sep 17 00:00:00 2001 From: Alyxia Sother Date: Sat, 19 Feb 2022 14:32:46 +0100 Subject: [PATCH 4/7] [nvim] Fix HTML indenting in PHP --- nvim/dotfiles/plugins-list.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/nvim/dotfiles/plugins-list.vim b/nvim/dotfiles/plugins-list.vim index 6879df1..92161d2 100644 --- a/nvim/dotfiles/plugins-list.vim +++ b/nvim/dotfiles/plugins-list.vim @@ -25,6 +25,7 @@ let s:plug = funcref('dotfiles#plugman#register') call s:plug('luke-gru/vim-riml') call s:plug('bhurlow/vim-parinfer') call s:plug('vim-scripts/newlisp') + call s:plug('captbaritone/better-indent-support-for-php-with-html') if has('unix') call s:plug('nvim-neorg/neorg', { 'branch': 'unstable' }) " dependencies {{{ call s:plug('nvim-treesitter/nvim-treesitter', { 'do': ':TSUpdate' }) From fcb39b053ef4e82f41d9e10b1a10c88ee54bdcaa Mon Sep 17 00:00:00 2001 From: Alyxia Sother Date: Sun, 20 Feb 2022 20:13:39 +0100 Subject: [PATCH 5/7] [nvim] Install Treesitter and do basic config --- nvim/after/queries/javascript/highlights.scm | 3 +++ nvim/colors/clisp.lua | 2 ++ nvim/dotfiles/plugins-list.vim | 5 ++++ nvim/plugin/treesitter.lua | 25 +++++++++++++++++++- nvim/syntax/clisp.vim | 4 ++++ 5 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 nvim/after/queries/javascript/highlights.scm create mode 100644 nvim/colors/clisp.lua create mode 100644 nvim/syntax/clisp.vim diff --git a/nvim/after/queries/javascript/highlights.scm b/nvim/after/queries/javascript/highlights.scm new file mode 100644 index 0000000..273faec --- /dev/null +++ b/nvim/after/queries/javascript/highlights.scm @@ -0,0 +1,3 @@ +(variable_declarator + name: (identifier) @clisp.function + (#match? @clisp.function "test")) diff --git a/nvim/colors/clisp.lua b/nvim/colors/clisp.lua new file mode 100644 index 0000000..4288921 --- /dev/null +++ b/nvim/colors/clisp.lua @@ -0,0 +1,2 @@ +local hl_map = vim.treesitter.highlighter.hl_map +hl_map['clisp.function'] = "MyGroup" diff --git a/nvim/dotfiles/plugins-list.vim b/nvim/dotfiles/plugins-list.vim index 92161d2..331fe38 100644 --- a/nvim/dotfiles/plugins-list.vim +++ b/nvim/dotfiles/plugins-list.vim @@ -1,5 +1,10 @@ let s:plug = funcref('dotfiles#plugman#register') +" Programming {{{ + call s:plug('nvim-treesitter/nvim-treesitter') + call s:plug('nvim-treesitter/playground') +" }}} + " UI {{{ call s:plug('romgrk/barbar.nvim') call s:plug('hoob3rt/lualine.nvim') diff --git a/nvim/plugin/treesitter.lua b/nvim/plugin/treesitter.lua index 65cb02e..e6cc799 100644 --- a/nvim/plugin/treesitter.lua +++ b/nvim/plugin/treesitter.lua @@ -12,5 +12,28 @@ parser_configs.norg = { } require('nvim-treesitter.configs').setup { - ensure_installed = { "norg" } + ensure_installed = { "norg" }, + playground = { + enable = true, + disable = {}, + updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code + persist_queries = false, -- Whether the query persists across vim sessions + keybindings = { + toggle_query_editor = 'o', + toggle_hl_groups = 'i', + toggle_injected_languages = 't', + toggle_anonymous_nodes = 'a', + toggle_language_display = 'I', + focus_language = 'f', + unfocus_language = 'F', + update = 'R', + goto_node = '', + show_help = '?', + }, + }, + query_linter = { + enable = true, + use_virtual_text = true, + lint_events = {"BufWrite", "CursorHold"}, + }, } diff --git a/nvim/syntax/clisp.vim b/nvim/syntax/clisp.vim new file mode 100644 index 0000000..1193588 --- /dev/null +++ b/nvim/syntax/clisp.vim @@ -0,0 +1,4 @@ +syntax keyword ClispFunction test + +hi! MyGroup guibg=#ffffff guifg=#000000 +hi! ClispFunction MyGroup From c5da909ed2c5a2e77dafecbec9a7d6e6fa305828 Mon Sep 17 00:00:00 2001 From: pollen__ <36719558+pollen00@users.noreply.github.com> Date: Mon, 21 Feb 2022 02:11:26 -0600 Subject: [PATCH 6/7] Fix Treesitter (#2) * Why does this work? * source color file :) --- nvim/colors/clisp.lua | 5 +++-- nvim/init.vim | 1 + nvim/plugin/treesitter.lua | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/nvim/colors/clisp.lua b/nvim/colors/clisp.lua index 4288921..b06616a 100644 --- a/nvim/colors/clisp.lua +++ b/nvim/colors/clisp.lua @@ -1,2 +1,3 @@ -local hl_map = vim.treesitter.highlighter.hl_map -hl_map['clisp.function'] = "MyGroup" +require "nvim-treesitter.highlight" +local hlmap = vim.treesitter.highlighter.hl_map +hlmap["clisp.function"] = "RedrawDebugRecompose" diff --git a/nvim/init.vim b/nvim/init.vim index 1eeaf5e..aa28afe 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -7,3 +7,4 @@ let g:dotfiles_rainbow_indent_opacity = 0.5 source :p:h/../dmitmel-dotfiles/nvim/init.vim luafile :p:h/init.lua +luafile :p:h/colors/clisp.lua diff --git a/nvim/plugin/treesitter.lua b/nvim/plugin/treesitter.lua index e6cc799..81753ec 100644 --- a/nvim/plugin/treesitter.lua +++ b/nvim/plugin/treesitter.lua @@ -12,6 +12,11 @@ parser_configs.norg = { } require('nvim-treesitter.configs').setup { + highlight = { + enable = true, + additional_vim_regex_highlighting = false, + }, + ensure_installed = { "norg" }, playground = { enable = true, From d7ecf6fd8130d59b3e0eb80f229f8b806bc44a79 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Feb 2022 02:26:56 +0000 Subject: [PATCH 7/7] Bump prismjs from 1.25.0 to 1.27.0 in /script-resources/markdown2htmldoc Bumps [prismjs](https://github.com/PrismJS/prism) from 1.25.0 to 1.27.0. - [Release notes](https://github.com/PrismJS/prism/releases) - [Changelog](https://github.com/PrismJS/prism/blob/master/CHANGELOG.md) - [Commits](https://github.com/PrismJS/prism/compare/v1.25.0...v1.27.0) --- updated-dependencies: - dependency-name: prismjs dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- script-resources/markdown2htmldoc/package.json | 2 +- script-resources/markdown2htmldoc/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/script-resources/markdown2htmldoc/package.json b/script-resources/markdown2htmldoc/package.json index 41f9350..7944534 100644 --- a/script-resources/markdown2htmldoc/package.json +++ b/script-resources/markdown2htmldoc/package.json @@ -13,7 +13,7 @@ "markdown-it-emoji": "^2.0.0", "markdown-it-footnote": "^3.0.3", "markdown-it-task-checkbox": "^1.0.6", - "prismjs": "^1.25.0" + "prismjs": "^1.27.0" }, "devDependencies": { "eslint": "^7.32.0", diff --git a/script-resources/markdown2htmldoc/yarn.lock b/script-resources/markdown2htmldoc/yarn.lock index 9d3991c..ba1efab 100644 --- a/script-resources/markdown2htmldoc/yarn.lock +++ b/script-resources/markdown2htmldoc/yarn.lock @@ -815,10 +815,10 @@ prettier@^2.4.1: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c" integrity sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA== -prismjs@^1.25.0: - version "1.25.0" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.25.0.tgz#6f822df1bdad965734b310b315a23315cf999756" - integrity sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg== +prismjs@^1.27.0: + version "1.27.0" + resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.27.0.tgz#bb6ee3138a0b438a3653dd4d6ce0cc6510a45057" + integrity sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA== progress@^2.0.0: version "2.0.3"