Compare commits

...

8 commits

Author SHA1 Message Date
dependabot[bot]
d7ecf6fd81
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] <support@github.com>
2022-02-26 02:26:56 +00:00
pollen__
c5da909ed2
Fix Treesitter (#2)
* Why does this work?

* source color file :)
2022-02-21 09:11:26 +01:00
Alyxia Sother
fcb39b053e
[nvim] Install Treesitter and do basic config 2022-02-20 20:13:39 +01:00
Alyxia Sother
361a5e5bd2
[nvim] Fix HTML indenting in PHP 2022-02-19 14:32:46 +01:00
Alyxia Sother
74ebb5346c
[nvim] Add syntax/ftdetect for Melody files 2022-02-17 11:51:12 +01:00
Alyxia Sother
c2e38b8904
Merge branch 'master' of git-a:keanuplayz/dotfiles 2022-02-17 11:50:13 +01:00
Alyxia Sother
f0b537a486
[nvim] Wrap more plugin configs in pcalls 2022-02-17 10:15:51 +01:00
GitHub
0ab1f77979 [dmitmel] Update submodule 2022-02-17 00:29:19 +00:00
13 changed files with 75 additions and 15 deletions

@ -1 +1 @@
Subproject commit 9e6941eeb7728f0ceadffb501f473a08837098ac Subproject commit f1a9b55666c97cac78f40afc395f47246811d350

View file

@ -0,0 +1,3 @@
(variable_declarator
name: (identifier) @clisp.function
(#match? @clisp.function "test"))

3
nvim/colors/clisp.lua Normal file
View file

@ -0,0 +1,3 @@
require "nvim-treesitter.highlight"
local hlmap = vim.treesitter.highlighter.hl_map
hlmap["clisp.function"] = "RedrawDebugRecompose"

View file

@ -1,5 +1,10 @@
let s:plug = funcref('dotfiles#plugman#register') let s:plug = funcref('dotfiles#plugman#register')
" Programming {{{
call s:plug('nvim-treesitter/nvim-treesitter')
call s:plug('nvim-treesitter/playground')
" }}}
" UI {{{ " UI {{{
call s:plug('romgrk/barbar.nvim') call s:plug('romgrk/barbar.nvim')
call s:plug('hoob3rt/lualine.nvim') call s:plug('hoob3rt/lualine.nvim')
@ -25,6 +30,7 @@ let s:plug = funcref('dotfiles#plugman#register')
call s:plug('luke-gru/vim-riml') call s:plug('luke-gru/vim-riml')
call s:plug('bhurlow/vim-parinfer') call s:plug('bhurlow/vim-parinfer')
call s:plug('vim-scripts/newlisp') call s:plug('vim-scripts/newlisp')
call s:plug('captbaritone/better-indent-support-for-php-with-html')
if has('unix') if has('unix')
call s:plug('nvim-neorg/neorg', { 'branch': 'unstable' }) " dependencies {{{ call s:plug('nvim-neorg/neorg', { 'branch': 'unstable' }) " dependencies {{{
call s:plug('nvim-treesitter/nvim-treesitter', { 'do': ':TSUpdate' }) call s:plug('nvim-treesitter/nvim-treesitter', { 'do': ':TSUpdate' })

View file

@ -7,4 +7,5 @@ augroup dotfilesftdetect
autocmd BufNewFile,BufRead *.dream setf dream autocmd BufNewFile,BufRead *.dream setf dream
autocmd BufNewFile,BufRead *.newlisp setf newlisp autocmd BufNewFile,BufRead *.newlisp setf newlisp
autocmd BufNewFile,BufRead *.mdy setf melody
augroup END augroup END

View file

@ -7,3 +7,4 @@ let g:dotfiles_rainbow_indent_opacity = 0.5
source <sfile>:p:h/../dmitmel-dotfiles/nvim/init.vim source <sfile>:p:h/../dmitmel-dotfiles/nvim/init.vim
luafile <sfile>:p:h/init.lua luafile <sfile>:p:h/init.lua
luafile <sfile>:p:h/colors/clisp.lua

View file

@ -1,5 +1,7 @@
local dotfiles_gruv = require'lualine.themes.gruvbox' local dotfiles_gruv = require('lualine.themes.gruvbox')
local theme = require'dotfiles.colorscheme' 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://github.com/dmitmel/dotfiles/commit/bf96e553764e3a166286f5a6a8017e01dadcf6f9
-- https://ptb.discord.com/channels/382339402338402315/382339402338402317/885864846892077086 -- https://ptb.discord.com/channels/382339402338402315/382339402338402317/885864846892077086
@ -37,7 +39,7 @@ local function showBoard()
end end
end end
require('lualine').setup{ lualine.setup{
options = { options = {
theme = dotfiles_gruv theme = dotfiles_gruv
} }

View file

@ -1,14 +1,14 @@
local ok, neorg = pcall(require, 'neorg') local okn, neorg = pcall(require, 'neorg')
if not ok then return end; if not okn then return end;
local ok, cmp = pcall(require, 'cmp') local okc, cmp = pcall(require, 'cmp')
if not ok then return end; if not okc then return end;
local cmp_config = cmp.get_config() local cmp_config = cmp.get_config()
table.insert(cmp_config.sources, { name = "neorg" }) table.insert(cmp_config.sources, { name = "neorg" })
cmp.setup(cmp_config) cmp.setup(cmp_config)
require('neorg').setup { neorg.setup {
load = { load = {
["core.defaults"] = {}, ["core.defaults"] = {},
["core.norg.concealer"] = {}, ["core.norg.concealer"] = {},

View file

@ -12,5 +12,33 @@ parser_configs.norg = {
} }
require('nvim-treesitter.configs').setup { require('nvim-treesitter.configs').setup {
ensure_installed = { "norg" } highlight = {
enable = true,
additional_vim_regex_highlighting = false,
},
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 = '<cr>',
show_help = '?',
},
},
query_linter = {
enable = true,
use_virtual_text = true,
lint_events = {"BufWrite", "CursorHold"},
},
} }

4
nvim/syntax/clisp.vim Normal file
View file

@ -0,0 +1,4 @@
syntax keyword ClispFunction test
hi! MyGroup guibg=#ffffff guifg=#000000
hi! ClispFunction MyGroup

12
nvim/syntax/melody.vim Normal file
View file

@ -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

View file

@ -13,7 +13,7 @@
"markdown-it-emoji": "^2.0.0", "markdown-it-emoji": "^2.0.0",
"markdown-it-footnote": "^3.0.3", "markdown-it-footnote": "^3.0.3",
"markdown-it-task-checkbox": "^1.0.6", "markdown-it-task-checkbox": "^1.0.6",
"prismjs": "^1.25.0" "prismjs": "^1.27.0"
}, },
"devDependencies": { "devDependencies": {
"eslint": "^7.32.0", "eslint": "^7.32.0",

View file

@ -815,10 +815,10 @@ prettier@^2.4.1:
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c"
integrity sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA== integrity sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==
prismjs@^1.25.0: prismjs@^1.27.0:
version "1.25.0" version "1.27.0"
resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.25.0.tgz#6f822df1bdad965734b310b315a23315cf999756" resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.27.0.tgz#bb6ee3138a0b438a3653dd4d6ce0cc6510a45057"
integrity sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg== integrity sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==
progress@^2.0.0: progress@^2.0.0:
version "2.0.3" version "2.0.3"