Compare commits
No commits in common. "690d514165c330ed7c5d2d09447ddeb4d23a5464" and "47d8aa173c762f774a574a07d7a294fb3e55cf76" have entirely different histories.
690d514165
...
47d8aa173c
@ -1 +1 @@
|
|||||||
Salt pillar and states for my personal computers
|
Salt states for my personal computers.
|
||||||
|
3
salt/common.sls
Normal file
3
salt/common.sls
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
include:
|
||||||
|
- profile.zypper
|
||||||
|
- profile.vim
|
224
salt/files/home/georg/.config/nvim/init.vim
Normal file
224
salt/files/home/georg/.config/nvim/init.vim
Normal file
@ -0,0 +1,224 @@
|
|||||||
|
call plug#begin()
|
||||||
|
""" BEGIN OF Nim
|
||||||
|
Plug 'alaviss/nim.nvim'
|
||||||
|
Plug 'prabirshrestha/asyncomplete.vim'
|
||||||
|
au User asyncomplete_setup call asyncomplete#register_source({
|
||||||
|
\ 'name': 'nim',
|
||||||
|
\ 'whitelist': ['nim'],
|
||||||
|
\ 'completor': {opt, ctx -> nim#suggest#sug#GetAllCandidates({start, candidates -> asyncomplete#complete(opt['name'], ctx, start, candidates)})}
|
||||||
|
\ })
|
||||||
|
""" END OF Nim
|
||||||
|
|
||||||
|
""" BEGIN of MdPreview
|
||||||
|
""" Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app && yarn install' }
|
||||||
|
""" END of MdPreview
|
||||||
|
|
||||||
|
""" BEGIN OF Scala
|
||||||
|
Plug 'neoclide/coc.nvim', {'branch': 'release'}
|
||||||
|
call plug#end()
|
||||||
|
autocmd FileType json syntax match Comment +\/\/.\+$+
|
||||||
|
" Set internal encoding of vim, not needed on neovim, since coc.nvim using some
|
||||||
|
" unicode characters in the file autoload/float.vim
|
||||||
|
set encoding=utf-8
|
||||||
|
|
||||||
|
" TextEdit might fail if hidden is not set.
|
||||||
|
set hidden
|
||||||
|
|
||||||
|
" Some servers have issues with backup files, see #649.
|
||||||
|
set nobackup
|
||||||
|
set nowritebackup
|
||||||
|
|
||||||
|
" Give more space for displaying messages.
|
||||||
|
set cmdheight=2
|
||||||
|
|
||||||
|
" Having longer updatetime (default is 4000 ms = 4 s) leads to noticeable
|
||||||
|
" delays and poor user experience.
|
||||||
|
set updatetime=300
|
||||||
|
|
||||||
|
" Don't pass messages to |ins-completion-menu|.
|
||||||
|
set shortmess+=c
|
||||||
|
|
||||||
|
" Always show the signcolumn, otherwise it would shift the text each time
|
||||||
|
" diagnostics appear/become resolved.
|
||||||
|
if has("nvim-0.5.0") || has("patch-8.1.1564")
|
||||||
|
" Recently vim can merge signcolumn and number column into one
|
||||||
|
set signcolumn=number
|
||||||
|
else
|
||||||
|
set signcolumn=yes
|
||||||
|
endif
|
||||||
|
|
||||||
|
" Use tab for trigger completion with characters ahead and navigate.
|
||||||
|
" NOTE: Use command ':verbose imap <tab>' to make sure tab is not mapped by
|
||||||
|
" other plugin before putting this into your config.
|
||||||
|
inoremap <silent><expr> <TAB>
|
||||||
|
\ pumvisible() ? "\<C-n>" :
|
||||||
|
\ <SID>check_back_space() ? "\<TAB>" :
|
||||||
|
\ coc#refresh()
|
||||||
|
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
|
||||||
|
|
||||||
|
function! s:check_back_space() abort
|
||||||
|
let col = col('.') - 1
|
||||||
|
return !col || getline('.')[col - 1] =~# '\s'
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
" Use <c-space> to trigger completion.
|
||||||
|
if has('nvim')
|
||||||
|
inoremap <silent><expr> <c-space> coc#refresh()
|
||||||
|
else
|
||||||
|
inoremap <silent><expr> <c-@> coc#refresh()
|
||||||
|
endif
|
||||||
|
|
||||||
|
" Make <CR> auto-select the first completion item and notify coc.nvim to
|
||||||
|
" format on enter, <cr> could be remapped by other vim plugin
|
||||||
|
inoremap <silent><expr> <cr> pumvisible() ? coc#_select_confirm()
|
||||||
|
\: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
|
||||||
|
|
||||||
|
" Use `[g` and `]g` to navigate diagnostics
|
||||||
|
" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list.
|
||||||
|
nmap <silent> [g <Plug>(coc-diagnostic-prev)
|
||||||
|
nmap <silent> ]g <Plug>(coc-diagnostic-next)
|
||||||
|
|
||||||
|
" GoTo code navigation.
|
||||||
|
nmap <silent> gd <Plug>(coc-definition)
|
||||||
|
nmap <silent> gy <Plug>(coc-type-definition)
|
||||||
|
nmap <silent> gi <Plug>(coc-implementation)
|
||||||
|
nmap <silent> gr <Plug>(coc-references)
|
||||||
|
|
||||||
|
" Use K to show documentation in preview window.
|
||||||
|
nnoremap <silent> K :call <SID>show_documentation()<CR>
|
||||||
|
|
||||||
|
function! s:show_documentation()
|
||||||
|
if (index(['vim','help'], &filetype) >= 0)
|
||||||
|
execute 'h '.expand('<cword>')
|
||||||
|
elseif (coc#rpc#ready())
|
||||||
|
call CocActionAsync('doHover')
|
||||||
|
else
|
||||||
|
execute '!' . &keywordprg . " " . expand('<cword>')
|
||||||
|
endif
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
" Highlight the symbol and its references when holding the cursor.
|
||||||
|
autocmd CursorHold * silent call CocActionAsync('highlight')
|
||||||
|
|
||||||
|
" Symbol renaming.
|
||||||
|
nmap <leader>rn <Plug>(coc-rename)
|
||||||
|
|
||||||
|
" Formatting selected code.
|
||||||
|
xmap <leader>f <Plug>(coc-format-selected)
|
||||||
|
nmap <leader>f <Plug>(coc-format-selected)
|
||||||
|
|
||||||
|
augroup mygroup
|
||||||
|
autocmd!
|
||||||
|
" Setup formatexpr specified filetype(s).
|
||||||
|
autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected')
|
||||||
|
" Update signature help on jump placeholder.
|
||||||
|
autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp')
|
||||||
|
augroup end
|
||||||
|
|
||||||
|
" Applying codeAction to the selected region.
|
||||||
|
" Example: `<leader>aap` for current paragraph
|
||||||
|
xmap <leader>a <Plug>(coc-codeaction-selected)
|
||||||
|
nmap <leader>a <Plug>(coc-codeaction-selected)
|
||||||
|
|
||||||
|
" Remap keys for applying codeAction to the current buffer.
|
||||||
|
nmap <leader>ac <Plug>(coc-codeaction)
|
||||||
|
" Apply AutoFix to problem on the current line.
|
||||||
|
nmap <leader>qf <Plug>(coc-fix-current)
|
||||||
|
|
||||||
|
" Run the Code Lens action on the current line.
|
||||||
|
nmap <leader>cl <Plug>(coc-codelens-action)
|
||||||
|
|
||||||
|
" Map function and class text objects
|
||||||
|
" NOTE: Requires 'textDocument.documentSymbol' support from the language server.
|
||||||
|
xmap if <Plug>(coc-funcobj-i)
|
||||||
|
omap if <Plug>(coc-funcobj-i)
|
||||||
|
xmap af <Plug>(coc-funcobj-a)
|
||||||
|
omap af <Plug>(coc-funcobj-a)
|
||||||
|
xmap ic <Plug>(coc-classobj-i)
|
||||||
|
omap ic <Plug>(coc-classobj-i)
|
||||||
|
xmap ac <Plug>(coc-classobj-a)
|
||||||
|
omap ac <Plug>(coc-classobj-a)
|
||||||
|
|
||||||
|
" Remap <C-f> and <C-b> for scroll float windows/popups.
|
||||||
|
if has('nvim-0.4.0') || has('patch-8.2.0750')
|
||||||
|
nnoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>"
|
||||||
|
nnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
|
||||||
|
inoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? "\<c-r>=coc#float#scroll(1)\<cr>" : "\<Right>"
|
||||||
|
inoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? "\<c-r>=coc#float#scroll(0)\<cr>" : "\<Left>"
|
||||||
|
vnoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>"
|
||||||
|
vnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
|
||||||
|
endif
|
||||||
|
|
||||||
|
" Use CTRL-S for selections ranges.
|
||||||
|
" Requires 'textDocument/selectionRange' support of language server.
|
||||||
|
nmap <silent> <C-s> <Plug>(coc-range-select)
|
||||||
|
xmap <silent> <C-s> <Plug>(coc-range-select)
|
||||||
|
|
||||||
|
" Add `:Format` command to format current buffer.
|
||||||
|
command! -nargs=0 Format :call CocActionAsync('format')
|
||||||
|
|
||||||
|
" Add `:Fold` command to fold current buffer.
|
||||||
|
command! -nargs=? Fold :call CocAction('fold', <f-args>)
|
||||||
|
|
||||||
|
" Add `:OR` command for organize imports of the current buffer.
|
||||||
|
command! -nargs=0 OR :call CocActionAsync('runCommand', 'editor.action.organizeImport')
|
||||||
|
|
||||||
|
" Add (Neo)Vim's native statusline support.
|
||||||
|
" NOTE: Please see `:h coc-status` for integrations with external plugins that
|
||||||
|
" provide custom statusline: lightline.vim, vim-airline.
|
||||||
|
set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')}
|
||||||
|
|
||||||
|
" Mappings for CoCList
|
||||||
|
" Show all diagnostics.
|
||||||
|
nnoremap <silent><nowait> <space>a :<C-u>CocList diagnostics<cr>
|
||||||
|
" Manage extensions.
|
||||||
|
nnoremap <silent><nowait> <space>e :<C-u>CocList extensions<cr>
|
||||||
|
" Show commands.
|
||||||
|
nnoremap <silent><nowait> <space>c :<C-u>CocList commands<cr>
|
||||||
|
" Find symbol of current document.
|
||||||
|
nnoremap <silent><nowait> <space>o :<C-u>CocList outline<cr>
|
||||||
|
" Search workspace symbols.
|
||||||
|
nnoremap <silent><nowait> <space>s :<C-u>CocList -I symbols<cr>
|
||||||
|
" Do default action for next item.
|
||||||
|
nnoremap <silent><nowait> <space>j :<C-u>CocNext<CR>
|
||||||
|
" Do default action for previous item.
|
||||||
|
nnoremap <silent><nowait> <space>k :<C-u>CocPrev<CR>
|
||||||
|
" Resume latest coc list.
|
||||||
|
nnoremap <silent><nowait> <space>p :<C-u>CocListResume<CR>
|
||||||
|
|
||||||
|
" Help Vim recognize *.sbt and *.sc as Scala files
|
||||||
|
au BufRead,BufNewFile *.sbt,*.sc set filetype=scala
|
||||||
|
|
||||||
|
" Used to expand decorations in worksheets
|
||||||
|
nmap <Leader>ws <Plug>(coc-metals-expand-decoration)
|
||||||
|
|
||||||
|
" Toggle panel with Tree Views
|
||||||
|
nnoremap <silent> <space>t :<C-u>CocCommand metals.tvp<CR>
|
||||||
|
" Toggle Tree View 'metalsPackages'
|
||||||
|
nnoremap <silent> <space>tp :<C-u>CocCommand metals.tvp metalsPackages<CR>
|
||||||
|
" Toggle Tree View 'metalsCompile'
|
||||||
|
nnoremap <silent> <space>tc :<C-u>CocCommand metals.tvp metalsCompile<CR>
|
||||||
|
" Toggle Tree View 'metalsBuild'
|
||||||
|
nnoremap <silent> <space>tb :<C-u>CocCommand metals.tvp metalsBuild<CR>
|
||||||
|
" Reveal current current class (trait or object) in Tree View 'metalsPackages'
|
||||||
|
nnoremap <silent> <space>tf :<C-u>CocCommand metals.revealInTreeView metalsPackages<CR>
|
||||||
|
|
||||||
|
""" END OF Scala
|
||||||
|
|
||||||
|
""" lua require('plugins')
|
||||||
|
|
||||||
|
lua <<EOF
|
||||||
|
-- local format_sync_grp = vim.api.nvim_create_augroup("GoFormat", {})
|
||||||
|
-- vim.api.nvim_create_autocmd("BufWritePre", {
|
||||||
|
-- pattern = "*.go",
|
||||||
|
-- callback = function()
|
||||||
|
-- require('go.format').goimports()
|
||||||
|
-- end,
|
||||||
|
-- group = format_sync_grp,
|
||||||
|
-- })
|
||||||
|
EOF
|
||||||
|
|
||||||
|
function! Toggle_transparent_background()
|
||||||
|
hi Normal guibg=NONE ctermbg=NONE
|
||||||
|
endfunction
|
||||||
|
call Toggle_transparent_background()
|
25
salt/files/home/georg/.config/nvim/lua/plugins.lua
Normal file
25
salt/files/home/georg/.config/nvim/lua/plugins.lua
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
-- This file can be loaded by calling `lua require('plugins')` from your init.vim
|
||||||
|
|
||||||
|
-- Only required if you have packer configured as `opt`
|
||||||
|
vim.cmd [[packadd packer.nvim]]
|
||||||
|
|
||||||
|
return require('packer').startup(function(use)
|
||||||
|
-- Packer can manage itself
|
||||||
|
use 'wbthomason/packer.nvim'
|
||||||
|
|
||||||
|
end)
|
||||||
|
|
||||||
|
{
|
||||||
|
"ray-x/go.nvim",
|
||||||
|
dependencies = { -- optional packages
|
||||||
|
"ray-x/guihua.lua",
|
||||||
|
"neovim/nvim-lspconfig",
|
||||||
|
"nvim-treesitter/nvim-treesitter",
|
||||||
|
},
|
||||||
|
config = function()
|
||||||
|
require("go").setup()
|
||||||
|
end,
|
||||||
|
event = {"CmdlineEnter"},
|
||||||
|
ft = {"go", 'gomod'},
|
||||||
|
build = ':lua require("go.install").update_all_sync()' -- if you need to install/update all binaries
|
||||||
|
}
|
2
salt/private.sls
Normal file
2
salt/private.sls
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
include:
|
||||||
|
- profile.mediathekview
|
3
salt/profile/mediathekview.sls
Normal file
3
salt/profile/mediathekview.sls
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
mediathekview_package:
|
||||||
|
pkg.installed:
|
||||||
|
- name: MediathekView
|
22
salt/profile/vim.sls
Normal file
22
salt/profile/vim.sls
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
vim_packages:
|
||||||
|
pkg.installed:
|
||||||
|
- pkgs:
|
||||||
|
- gvim
|
||||||
|
- neovim
|
||||||
|
- neovim-gtk
|
||||||
|
- nvim-plugin-lastplace
|
||||||
|
- nvim-plugin-markdown-preview
|
||||||
|
- python311-neovim
|
||||||
|
- tree-sitter-vim
|
||||||
|
- tree-sitter-vimdoc
|
||||||
|
- vim
|
||||||
|
- vim-data
|
||||||
|
- vim-plugin-nftables
|
||||||
|
- vim-plugin-salt
|
||||||
|
|
||||||
|
vim_files:
|
||||||
|
file.recurse:
|
||||||
|
- clean: true
|
||||||
|
- names:
|
||||||
|
- /home/georg/.config/nvim:
|
||||||
|
- source: salt://files/home/georg/.config/nvim
|
22
salt/profile/zypper.sls
Normal file
22
salt/profile/zypper.sls
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
/etc/zypp/vars.d/mirror:
|
||||||
|
file.managed:
|
||||||
|
- contents:
|
||||||
|
- download.opensuse.org
|
||||||
|
|
||||||
|
|
||||||
|
{%- for project, priority in {
|
||||||
|
'home:crameleon:media': 80,
|
||||||
|
'home:crameleon:misc': 110,
|
||||||
|
'home:crameleon:vim': 80,
|
||||||
|
}.items()
|
||||||
|
%}
|
||||||
|
|
||||||
|
{{ project }}:
|
||||||
|
pkgrepo.managed:
|
||||||
|
- baseurl: https://$mirror/repositories/{{ ':/'.join(project.split(':')) }}/openSUSE_Tumbleweed
|
||||||
|
- enabled: true
|
||||||
|
- priority: {{ priority }}
|
||||||
|
- gpgcheck: true
|
||||||
|
- refresh: true
|
||||||
|
|
||||||
|
{%- endfor %}
|
5
salt/top.sls
Normal file
5
salt/top.sls
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
base:
|
||||||
|
'*':
|
||||||
|
- common
|
||||||
|
bittersuse.home.lysergic.dev:
|
||||||
|
- private
|
Loading…
x
Reference in New Issue
Block a user