diff --git a/apps/kak/kakrc b/apps/kak/kakrc index 2a7dee8..f2ef56d 100644 --- a/apps/kak/kakrc +++ b/apps/kak/kakrc @@ -1,14 +1,13 @@ source "%val{config}/plugins/plug.kak/rc/plug.kak" plug "TeddyDD/kakoune-selenized" theme -plug "robertmeta/plug.kak" noload do %{ - set global plug_always_ensure true - set global plug_max_active_downloads 25 +plug "robertmeta/plug.kak" noload config %{ + set global plug_always_ensure true + set global plug_max_active_downloads 25 } plug "alexherbo2/connect.kak" -plug "ul/kak-lsp" do %{ - cargo build --release --locked - cargo install --force --path . +plug "kak-lsp/kak-lsp" do %{ + cargo install --locked --force --path . } plug 'delapouite/kakoune-buffers' %{ # map global normal ^ q @@ -21,24 +20,23 @@ plug 'delapouite/kakoune-buffers' %{ # map global normal B ': enter-user-mode -lock buffers' -docstring 'buffers (lock)' } +# eval %sh{kak-lsp --kakoune -s $kak_session} +hook global WinSetOption filetype=(rust|python|go|javascript|typescript|c|cpp|nim) %{ + lsp-enable-window +} + map global normal D 'd' -docstring 'delete to end of line' map global normal Y 'y' -docstring 'yank to end of line' -declare -hidden range-faces show_matching_range - hook global InsertChar k %{ try %{ exec -draft hH jk d exec }} -hook global WinCreate .* %{ - addhl ranges show_matching_range -} - map global normal '^' '' -docstring 'jump to start of line' -add-highlighter global/show-trailing-whitespaces regex '\h+$' 0:Error -add-highlighter global show-matching +# add-highlighter global/show-trailing-whitespaces regex '\h+$' 0:Error +# add-highlighter global show-matching set global tabstop 2 set global indentwidth 2 @@ -48,4 +46,4 @@ face global MenuBackground white,black face global MenuForeground black,blue face global PrimarySelection black,blue face global PrimarySelection black,white -face global MatchingChar default,gray +face global MatchingChar default,bright-black diff --git a/apps/neovim/plugins.vim b/apps/neovim/plugins.vim index cd13d98..7d6abbb 100644 --- a/apps/neovim/plugins.vim +++ b/apps/neovim/plugins.vim @@ -46,29 +46,29 @@ let g:polyglot_disabled = ['cue', 'cuesheet'] if exists('asmanviewer') || exists('nosession') let g:prosession_dir = '/dev/null' else - Plug 'tpope/vim-obsession' " session ease-of-use - Plug 'dhruvasagar/vim-prosession' " more session ease-of-use endif Plug 'junegunn/vim-plug' " plugin manager should manage itself +Plug 'junegunn/fzf', {'dir': '~/.fzf', 'do': './install --all'} " fuzzy file finding +Plug 'junegunn/fzf.vim' " helpers for using fzf in vim +Plug 'tpope/vim-obsession' " session ease-of-use +Plug 'dhruvasagar/vim-prosession' " more session ease-of-use Plug 'vim-airline/vim-airline' " status line Plug 'vim-airline/vim-airline-themes' " more minimal status line Plug 'nathanaelkane/vim-indent-guides' " indentation guides Plug 'SirVer/ultisnips' " snippet manager -Plug 'junegunn/fzf', {'dir': '~/.fzf', 'do': './install --all'} " fuzzy file finding -Plug 'junegunn/fzf.vim' " helpers for using fzf in vim Plug 'bkad/CamelCaseMotion' " camel case and underscore word movements Plug 'vim-scripts/LargeFile' " gracefully handle very large files Plug 'tpope/vim-commentary' " toggle comments in code easily Plug 'tpope/vim-repeat' " better vim repeating for plugin-provided actions -Plug 'vim-scripts/SyntaxRange' " defined different syntax ranges in a file for highlighting -Plug 'tmux-plugins/vim-tmux-focus-events' " allow transitions within tmux -Plug 'christoomey/vim-tmux-navigator' " allow transitions within tmux -Plug 'godlygeek/tabular' " align text +Plug 'vim-scripts/SyntaxRange' " define syntax ranges +Plug 'tmux-plugins/vim-tmux-focus-events' " allow transitions from tmux +Plug 'christoomey/vim-tmux-navigator' " allow transitions to tmux +Plug 'godlygeek/tabular' " commands for aligning text Plug 'lytedev/vim-superman' " view man pages with vim Plug 'machakann/vim-sandwich' " quickly modify text surrounding objects -Plug 'tpope/vim-speeddating' " vim knows about date-like text objects -Plug 'tpope/vim-fugitive' " vim git commands +Plug 'tpope/vim-speeddating' " date-like text objects +Plug 'tpope/vim-fugitive' " git commands Plug 'michaeljsmith/vim-indent-object' " adds an indentation level text object Plug 'wellle/targets.vim' " adds some more handy text objects Plug 'dbakker/vim-projectroot' " adds helper functions for getting to a project's root directory @@ -76,8 +76,6 @@ Plug 'junegunn/goyo.vim' " better distrac Plug 'junegunn/limelight.vim' " dim inactive blocks of code Plug 'tpope/vim-sleuth' " try and detect indent method Plug 'editorconfig/editorconfig-vim' " loads project-specific editor settings -Plug 'leafo/moonscript-vim', {'for': ['moon', 'moonscript']} " moonscript language -Plug 'OmniSharp/omnisharp-vim', {'for': ['cs']} " C# language Plug 'scrooloose/nerdtree' " file browser Plug 'tpope/vim-eunuch' " unix helper commands Plug 'mbbill/undotree' " undo tree visualizer @@ -85,15 +83,16 @@ Plug 'mbbill/undotree' " undo tree visu " language support Plug 'sheerun/vim-polyglot' " vim plugin loader for many languages +Plug 'OmniSharp/omnisharp-vim', {'for': ['cs']} " C# language Plug 'leafo/moonscript-vim', {'for': ['moon', 'moonscript']} " moonscript language Plug 'OmniSharp/omnisharp-vim', {'for': ['cs']} " C# language -Plug 'neoclide/coc.nvim', {'branch': 'release'} " language server interface -Plug 'elixir-lsp/elixir-ls', {'for': ['elixir', 'eelixir'], 'do': { -> g:elixirls.compile() }} -Plug 'tpope/vim-dadbod' " vim +" Plug 'neoclide/coc.nvim', {'branch': 'release'} " language server interface +Plug 'neovim/nvim-lspconfig' " neovim-native language server interface +Plug 'tpope/vim-dadbod' " vim database functions Plug 'lytedev/elm-vim', {'for': ['elm']} " elm lang Plug 'google/vim-jsonnet', {'for': ['jsonnet', 'libsonnet']} " jsonnet Plug 'sirtaj/vim-openscad', {'for': ['scad']} " openscad -Plug 'jjo/vim-cue' -Plug 'chrisbra/csv.vim' +Plug 'jjo/vim-cue' " cuelang Plug 'calviken/vim-gdscript3', {'for': ['gdscript']} " godot scripts +" Plug 'chrisbra/csv.vim' " Plug 'ssh://git@git.lyte.dev:2222/lytedev/vim-lytlang.git'