Compare commits

..

76 commits

Author SHA1 Message Date
dependabot[bot]
f1fc34923c
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-11-25 10:29:28 +00:00
Alyxia Sother
2966ad4956
[dmitmel] Update submodule 2022-11-25 10:29:09 +00:00
Alyxia Sother
440a7beb72
[script-resources] Update dependencies 2022-11-25 10:28:31 +00:00
GitHub
256e8b6ee7 [dmitmel] Update submodule 2022-11-19 00:54:58 +00:00
GitHub
73db4b0cd4 [dmitmel] Update submodule 2022-11-18 00:56:50 +00:00
GitHub
edba153561 [dmitmel] Update submodule 2022-11-14 00:53:10 +00:00
GitHub
49e1e7f9d5 [dmitmel] Update submodule 2022-11-12 00:55:44 +00:00
GitHub
17969ceae8 [dmitmel] Update submodule 2022-11-11 00:58:43 +00:00
GitHub
0554766831 [dmitmel] Update submodule 2022-11-10 00:56:59 +00:00
GitHub
f41a6ab25b [dmitmel] Update submodule 2022-10-30 01:04:42 +00:00
GitHub
342ff91de2 [dmitmel] Update submodule 2022-10-05 01:10:17 +00:00
GitHub
f0da78626d [dmitmel] Update submodule 2022-09-28 01:05:52 +00:00
Alyxia
4ca270760b
[nvim] Add TeX plugins 2022-09-25 11:21:55 +02:00
Alyxia
d2f964c742
[nvim] Fix some coc complaints 2022-09-25 11:21:30 +02:00
GitHub
75d79fc13c [dmitmel] Update submodule 2022-09-18 01:04:09 +00:00
GitHub
567aa704e3 [dmitmel] Update submodule 2022-09-11 01:01:03 +00:00
GitHub
48d0461546 [dmitmel] Update submodule 2022-09-02 00:57:49 +00:00
GitHub
d3ac2b5d8a [dmitmel] Update submodule 2022-09-01 00:55:40 +00:00
Alyxia Sother
50793f84a9
[nvim] Get rid of lisp plugin 2022-08-08 22:24:42 +02:00
Alyxia Sother
b27bb07d9d
[nvim] Add new required coc keybinds 2022-08-08 22:24:29 +02:00
Alyxia Sother
3730b40d25
[nvim] Fix faulty if statement 2022-08-08 22:22:33 +02:00
GitHub
c23ce14d05 [dmitmel] Update submodule 2022-07-25 00:53:43 +00:00
GitHub
0ad9eee709 [dmitmel] Update submodule 2022-07-16 00:55:16 +00:00
GitHub
20e0b37e6c [dmitmel] Update submodule 2022-07-13 00:52:59 +00:00
GitHub
9a11e2457d [dmitmel] Update submodule 2022-07-12 00:57:04 +00:00
GitHub
fb71948e1f [dmitmel] Update submodule 2022-07-11 00:53:14 +00:00
GitHub
b2aa50c348 [dmitmel] Update submodule 2022-07-10 00:58:35 +00:00
GitHub
ad72eb8225 [dmitmel] Update submodule 2022-07-08 00:56:55 +00:00
GitHub
6194a31ea3 [dmitmel] Update submodule 2022-07-07 00:56:55 +00:00
GitHub
570b46adc3 [dmitmel] Update submodule 2022-07-06 00:56:26 +00:00
GitHub
bbf5b0afea [dmitmel] Update submodule 2022-07-02 00:53:29 +00:00
GitHub
23c2294019 [dmitmel] Update submodule 2022-06-27 00:56:20 +00:00
Alyxia Sother
42bff9956b
[nvim] Add neovim checks 2022-06-26 09:00:51 +00:00
GitHub
d68351e2fd [dmitmel] Update submodule 2022-06-18 00:51:13 +00:00
GitHub
a7ce0f3964 [dmitmel] Update submodule 2022-06-11 00:46:37 +00:00
GitHub
e2cbaa27ae [dmitmel] Update submodule 2022-06-10 00:51:29 +00:00
GitHub
fad6dbd24c [dmitmel] Update submodule 2022-06-08 00:48:06 +00:00
GitHub
e6c3cc6320 [dmitmel] Update submodule 2022-05-26 00:52:31 +00:00
GitHub
004333c498 [dmitmel] Update submodule 2022-05-24 00:53:30 +00:00
GitHub
1efbda9d39 [dmitmel] Update submodule 2022-05-23 00:46:52 +00:00
GitHub
dda36eeab0 [dmitmel] Update submodule 2022-05-21 00:43:09 +00:00
GitHub
2e6af7fd03 [dmitmel] Update submodule 2022-05-17 00:48:15 +00:00
GitHub
37836b0a54 [dmitmel] Update submodule 2022-05-09 00:50:00 +00:00
GitHub
d6ecc51b23 [dmitmel] Update submodule 2022-05-08 00:45:05 +00:00
GitHub
31daec6228 [dmitmel] Update submodule 2022-05-07 00:43:56 +00:00
GitHub
890164ff14 [dmitmel] Update submodule 2022-05-04 00:49:29 +00:00
GitHub
8c27b5d89a [dmitmel] Update submodule 2022-05-02 00:47:46 +00:00
GitHub
55671147bd [dmitmel] Update submodule 2022-05-01 00:57:31 +00:00
GitHub
3d0e89e4e4 [dmitmel] Update submodule 2022-04-27 00:55:51 +00:00
GitHub
c03b35eaf5 [dmitmel] Update submodule 2022-04-26 00:47:59 +00:00
GitHub
b0fc4cfa53 [dmitmel] Update submodule 2022-04-21 00:49:19 +00:00
GitHub
38e6f38c2a [dmitmel] Update submodule 2022-04-20 00:53:45 +00:00
GitHub
7ca2f7153e [dmitmel] Update submodule 2022-04-18 00:50:32 +00:00
GitHub
b147edb966 [dmitmel] Update submodule 2022-04-10 00:42:58 +00:00
GitHub
24eaaef52d [dmitmel] Update submodule 2022-04-09 00:40:36 +00:00
GitHub
913fb6536d [dmitmel] Update submodule 2022-04-08 12:05:35 +00:00
GitHub
c2403810f2 [dmitmel] Update submodule 2022-04-08 00:43:18 +00:00
GitHub
2303e9b4ee [dmitmel] Update submodule 2022-04-07 00:43:07 +00:00
GitHub
6e3c73854f [dmitmel] Update submodule 2022-04-06 00:43:38 +00:00
GitHub
c9c104942b [dmitmel] Update submodule 2022-04-05 00:40:52 +00:00
GitHub
97c107b927 [dmitmel] Update submodule 2022-03-31 00:41:14 +00:00
GitHub
bf382b8cbf [dmitmel] Update submodule 2022-03-30 00:40:44 +00:00
GitHub
5f76514247 [dmitmel] Update submodule 2022-03-26 00:39:11 +00:00
GitHub
91e3b15511 [dmitmel] Update submodule 2022-03-24 00:40:50 +00:00
GitHub
3c6898f5f4 [dmitmel] Update submodule 2022-03-23 00:43:46 +00:00
GitHub
b7d0c56360 [dmitmel] Update submodule 2022-03-22 00:38:43 +00:00
GitHub
09a43723a4 [dmitmel] Update submodule 2022-03-21 00:37:10 +00:00
GitHub
4484a842da [dmitmel] Update submodule 2022-03-20 00:38:00 +00:00
GitHub
6e946c6c6d [dmitmel] Update submodule 2022-03-17 00:39:07 +00:00
GitHub
ae0d28b851 [dmitmel] Update submodule 2022-03-16 00:39:12 +00:00
GitHub
1286d508fb [dmitmel] Update submodule 2022-03-15 00:42:56 +00:00
GitHub
a138dcc640 [dmitmel] Update submodule 2022-03-13 00:36:08 +00:00
GitHub
67f297f77b [dmitmel] Update submodule 2022-03-11 00:39:55 +00:00
GitHub
dcb08779ea [dmitmel] Update submodule 2022-03-07 00:36:52 +00:00
GitHub
9e2eab6e0c
[dmitmel] Update submodule 2022-03-05 11:32:52 +00:00
Alyxia Sother
296d65e319
[tmux] Fixup some of the config 2022-03-05 11:30:00 +00:00
16 changed files with 3047 additions and 94 deletions

@ -1 +1 @@
Subproject commit f1a9b55666c97cac78f40afc395f47246811d350
Subproject commit 3cf5d36805457bc82bb33e88ee317d0a2710d8e4

View file

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

View file

@ -1,2 +0,0 @@
call extend(g:dotfiles_coc_extensions, {'coc-cl': 1})
call extend(g:dotfiles_coc_filetypes, {'lsp': 1})

View file

@ -0,0 +1,2 @@
call extend(g:dotfiles_coc_extensions, {'coc-vimtex': 1})
call extend(g:dotfiles_coc_filetypes, {'tex': 1, 'cls': 1})

View file

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

View file

@ -1,54 +1,58 @@
let s:plug = funcref('dotfiles#plugman#register')
" Programming {{{
call s:plug('nvim-treesitter/nvim-treesitter')
call s:plug('nvim-treesitter/playground')
" }}}
" UI {{{
if has('nvim')
call s:plug('romgrk/barbar.nvim')
call s:plug('hoob3rt/lualine.nvim')
endif
" }}}
" Navigation {{{
if has('nvim')
call s:plug('nvim-telescope/telescope.nvim') " dependencies {{{
call s:plug('nvim-lua/plenary.nvim')
" }}}
endif
" }}}
" Files {{{
call s:plug('preservim/nerdtree')
if has('nvim')
call s:plug('kyazdani42/nvim-web-devicons')
call s:plug('akinsho/nvim-toggleterm.lua')
endif
call s:plug('preservim/nerdtree')
call s:plug('antoyo/vim-licenses')
" }}}
" Language specific {{{
call s:plug('alaviss/nim.nvim')
call s:plug('stevearc/vim-arduino')
if has('nvim')
call s:plug('xiyaowong/coc-nvim-lua')
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')
call s:plug('alaviss/nim.nvim')
if has('unix')
call s:plug('nvim-neorg/neorg', { 'branch': 'unstable' }) " dependencies {{{
call s:plug('nvim-treesitter/nvim-treesitter', { 'do': ':TSUpdate' })
" }}}
endif
endif
call s:plug('lervag/vimtex')
call s:plug('stevearc/vim-arduino')
call s:plug('luke-gru/vim-riml')
call s:plug('bhurlow/vim-parinfer')
call s:plug('vim-scripts/newlisp')
call s:plug('noahfrederick/vim-laravel') " dependencies {{{
call s:plug('noahfrederick/vim-composer')
call s:plug('tpope/vim-projectionist')
call s:plug('tpope/vim-dispatch')
" }}}
" }}}
" Misc {{{
call s:plug('junegunn/vader.vim')
if has('nvim')
call s:plug('andweeb/presence.nvim')
call s:plug('wakatime/vim-wakatime')
if has('nvim-0.6.0')
call s:plug('github/copilot.vim')
endif
endif
call s:plug('junegunn/vader.vim')
call s:plug('wakatime/vim-wakatime')
" }}}

View file

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

View file

@ -6,5 +6,20 @@ let g:vim_ide = 1
let g:dotfiles_rainbow_indent_opacity = 0.5
source <sfile>:p:h/../dmitmel-dotfiles/nvim/init.vim
if has('nvim')
luafile <sfile>:p:h/init.lua
luafile <sfile>:p:h/colors/clisp.lua
else
set termguicolors
endif
" Arrow key fix kanged from <https://vim.fandom.com/wiki/Fix_arrow_keys_that_display_A_B_C_D_on_remote_shell#Solution_21> {{{
if exists("g:HELP_MY_ARROW_KEYS_ARE_BROKEN")
" the following simply creates an ambiguous mapping so vim fully
" processes the escape sequence for terminal keys, see 'ttimeout' for a
" rough explanation, this just forces it to work
if &term[:4] == "xterm" || &term[:5] == 'screen' || &term[:3] == 'rxvt'
inoremap <silent> <C-[>OC <RIGHT>
endif
endif
" }}}

View file

@ -1,5 +1,23 @@
nnoremap <C-t> :NERDTreeToggle<CR>
" Completion {{{
function! s:check_back_space() abort
let col = col('.') - 1
return !col || getline('.')[col - 1] =~ '\s'
endfunction
nmap <silent> <F3> <Plug>(coc-codeaction-line)
xmap <silent> <F3> <Plug>(coc-codeaction-selected)
inoremap <expr> <cr> coc#pum#visible() ? coc#_select_confirm() : "\<CR>"
inoremap <silent><expr> <TAB>
\ coc#pum#visible() ? coc#pum#next(1):
\ <SID>check_back_space() ? "\<Tab>" :
\ coc#refresh()
inoremap <expr><S-TAB> coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>"
" }}}
" Copy to clipboard register and paste from clipboard register {{{
" Taken from https://unix.stackexchange.com/a/23437
nnoremap <C-y> "+y

View file

@ -1,7 +1,5 @@
local dotfiles_gruv = require('lualine.themes.gruvbox')
local theme = require('dotfiles.colorscheme')
local ok, lualine = pcall(require, 'lualine')
if not ok then return end;
local dotfiles_gruv = require'lualine.themes.gruvbox'
local theme = require'dotfiles.colorscheme'
-- https://github.com/dmitmel/dotfiles/commit/bf96e553764e3a166286f5a6a8017e01dadcf6f9
-- https://ptb.discord.com/channels/382339402338402315/382339402338402317/885864846892077086
@ -39,7 +37,7 @@ local function showBoard()
end
end
lualine.setup{
require('lualine').setup{
options = {
theme = dotfiles_gruv
}

View file

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

View file

@ -12,33 +12,5 @@ parser_configs.norg = {
}
require('nvim-treesitter.configs').setup {
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"},
},
ensure_installed = { "norg" }
}

View file

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

View file

@ -1,12 +0,0 @@
" 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

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,14 @@
set -g default-terminal 'screen-256color'
# Enable 256color and RGB support (because tmux loves ruining shell features)
set -g default-terminal "tmux-256color"
set-option -ga terminal-overrides ",xterm-256color:Tc"
set -as terminal-features ",gnome*:RGB"
# Enable mouse supports for those rare times I have to select something
set -g mouse on
# Prevent tmux from deleting significant amounts of history
set -g history-limit 100000
run 'if [ -d "~/.tmux/plugins/tpm" ]; then : ; else git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm; fi'
set -g @tpm_plugins ' \