mirror of
https://github.com/keanuplayz/dotfiles.git
synced 2024-08-15 02:33:12 +00:00
Compare commits
8 commits
f1fc34923c
...
d7ecf6fd81
Author | SHA1 | Date | |
---|---|---|---|
|
d7ecf6fd81 | ||
|
c5da909ed2 | ||
|
fcb39b053e | ||
|
361a5e5bd2 | ||
|
74ebb5346c | ||
|
c2e38b8904 | ||
|
f0b537a486 | ||
|
0ab1f77979 |
16 changed files with 93 additions and 3046 deletions
|
@ -1 +1 @@
|
|||
Subproject commit 3cf5d36805457bc82bb33e88ee317d0a2710d8e4
|
||||
Subproject commit f1a9b55666c97cac78f40afc395f47246811d350
|
3
nvim/after/queries/javascript/highlights.scm
Normal file
3
nvim/after/queries/javascript/highlights.scm
Normal file
|
@ -0,0 +1,3 @@
|
|||
(variable_declarator
|
||||
name: (identifier) @clisp.function
|
||||
(#match? @clisp.function "test"))
|
2
nvim/coc-languages/lisp.vim
Normal file
2
nvim/coc-languages/lisp.vim
Normal file
|
@ -0,0 +1,2 @@
|
|||
call extend(g:dotfiles_coc_extensions, {'coc-cl': 1})
|
||||
call extend(g:dotfiles_coc_filetypes, {'lsp': 1})
|
|
@ -1,2 +0,0 @@
|
|||
call extend(g:dotfiles_coc_extensions, {'coc-vimtex': 1})
|
||||
call extend(g:dotfiles_coc_filetypes, {'tex': 1, 'cls': 1})
|
3
nvim/colors/clisp.lua
Normal file
3
nvim/colors/clisp.lua
Normal file
|
@ -0,0 +1,3 @@
|
|||
require "nvim-treesitter.highlight"
|
||||
local hlmap = vim.treesitter.highlighter.hl_map
|
||||
hlmap["clisp.function"] = "RedrawDebugRecompose"
|
|
@ -1,58 +1,54 @@
|
|||
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
|
||||
call s:plug('romgrk/barbar.nvim')
|
||||
call s:plug('hoob3rt/lualine.nvim')
|
||||
" }}}
|
||||
|
||||
" Navigation {{{
|
||||
if has('nvim')
|
||||
call s:plug('nvim-telescope/telescope.nvim') " dependencies {{{
|
||||
call s:plug('nvim-lua/plenary.nvim')
|
||||
" }}}
|
||||
endif
|
||||
call s:plug('nvim-telescope/telescope.nvim') " dependencies {{{
|
||||
call s:plug('nvim-lua/plenary.nvim')
|
||||
" }}}
|
||||
" }}}
|
||||
|
||||
" Files {{{
|
||||
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('kyazdani42/nvim-web-devicons')
|
||||
call s:plug('akinsho/nvim-toggleterm.lua')
|
||||
call s:plug('antoyo/vim-licenses')
|
||||
" }}}
|
||||
|
||||
" Language specific {{{
|
||||
if has('nvim')
|
||||
call s:plug('xiyaowong/coc-nvim-lua')
|
||||
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('alaviss/nim.nvim')
|
||||
call s:plug('stevearc/vim-arduino')
|
||||
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')
|
||||
if has('unix')
|
||||
call s:plug('nvim-neorg/neorg', { 'branch': 'unstable' }) " dependencies {{{
|
||||
call s:plug('nvim-treesitter/nvim-treesitter', { 'do': ':TSUpdate' })
|
||||
" }}}
|
||||
endif
|
||||
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 {{{
|
||||
if has('nvim')
|
||||
call s:plug('andweeb/presence.nvim')
|
||||
if has('nvim-0.6.0')
|
||||
call s:plug('github/copilot.vim')
|
||||
endif
|
||||
endif
|
||||
call s:plug('junegunn/vader.vim')
|
||||
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
|
||||
" }}}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -6,20 +6,5 @@ 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
|
||||
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
|
||||
" }}}
|
||||
luafile <sfile>:p:h/init.lua
|
||||
luafile <sfile>:p:h/colors/clisp.lua
|
||||
|
|
|
@ -1,23 +1,5 @@
|
|||
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
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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"] = {},
|
||||
|
|
|
@ -12,5 +12,33 @@ parser_configs.norg = {
|
|||
}
|
||||
|
||||
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
4
nvim/syntax/clisp.vim
Normal 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
12
nvim/syntax/melody.vim
Normal 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
|
2961
script-resources/markdown2htmldoc/package-lock.json
generated
2961
script-resources/markdown2htmldoc/package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
@ -1,14 +1,6 @@
|
|||
# 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 default-terminal 'screen-256color'
|
||||
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 ' \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue