From 6fddacc2652ef3cf8853677bdd0efe2f69e6ec8f Mon Sep 17 00:00:00 2001 From: Daniel Lundin Date: Sun, 18 Apr 2021 18:51:03 +0200 Subject: [PATCH] nvim: all 0.5 and lua, baby! --- .config/bat/config | 1 + .config/nvim/.netrwhist | 12 + .config/nvim/coc-settings.json | 50 --- .config/nvim/colors/dln-dark.vim | 352 --------------- .config/nvim/colors/dln-dim.vim | 347 --------------- .config/nvim/colors/dln-light.vim | 354 --------------- .config/nvim/colors/dln.vim | 1 - .config/nvim/init.vim | 560 +----------------------- .config/nvim/lua/dln/lsp-config.lua | 113 +++++ .config/nvim/lua/dln/lspsaga.lua | 8 + .config/nvim/lua/dln/telescope.lua | 60 +++ .config/nvim/lua/dln/treesitter.lua | 56 +++ .config/nvim/lua/dln/utils.lua | 19 + .config/nvim/lua/init.lua | 62 +++ .config/nvim/lua/plugins.lua | 147 +++++++ .config/nvim/plugin/packer_compiled.vim | 136 ++++++ 16 files changed, 623 insertions(+), 1655 deletions(-) create mode 100644 .config/nvim/.netrwhist delete mode 100644 .config/nvim/coc-settings.json delete mode 100644 .config/nvim/colors/dln-dark.vim delete mode 100644 .config/nvim/colors/dln-dim.vim delete mode 100644 .config/nvim/colors/dln-light.vim delete mode 120000 .config/nvim/colors/dln.vim create mode 100644 .config/nvim/lua/dln/lsp-config.lua create mode 100644 .config/nvim/lua/dln/lspsaga.lua create mode 100644 .config/nvim/lua/dln/telescope.lua create mode 100644 .config/nvim/lua/dln/treesitter.lua create mode 100644 .config/nvim/lua/dln/utils.lua create mode 100644 .config/nvim/lua/init.lua create mode 100644 .config/nvim/lua/plugins.lua create mode 100644 .config/nvim/plugin/packer_compiled.vim diff --git a/.config/bat/config b/.config/bat/config index b6ccf7b..609fc6e 100644 --- a/.config/bat/config +++ b/.config/bat/config @@ -1,2 +1,3 @@ --italic-text=always --plain +--theme=ansi diff --git a/.config/nvim/.netrwhist b/.config/nvim/.netrwhist new file mode 100644 index 0000000..823f9b5 --- /dev/null +++ b/.config/nvim/.netrwhist @@ -0,0 +1,12 @@ +let g:netrw_dirhistmax =10 +let g:netrw_dirhistcnt =4 +let g:netrw_dirhist_4='/home/dln/src/github.com/tocaboca/Toca-Days/Infrastructure/Helm' +let g:netrw_dirhist_3='/home/dln/src/github.com/tocaboca/Toca-Days/Infrastructure/Helm/days' +let g:netrw_dirhist_2='/home/dln/src/github.com/tocaboca/toca-days-prod/blessings' +let g:netrw_dirhist_1='/home/dln/src/github.com/tocaboca/toca-infrastructure/flux/k8s/infra/tenants/toca-studio/clusters/studio' +let g:netrw_dirhist_0='/home/dln/src/github.com/tocaboca/toca-infrastructure/linkerd/gateway' +let g:netrw_dirhist_9='/home/dln/src/github.com/tocaboca/toca-infrastructure/cluster/terraform' +let g:netrw_dirhist_8='/home/dln/src/github.com/shelmangroup/tf-infra/lab001/vms/modules/fcos_vault_agent' +let g:netrw_dirhist_7='/tmp/squid/etc' +let g:netrw_dirhist_6='/tmp/squid' +let g:netrw_dirhist_5='/tmp/squid/etc' diff --git a/.config/nvim/coc-settings.json b/.config/nvim/coc-settings.json deleted file mode 100644 index f80da6c..0000000 --- a/.config/nvim/coc-settings.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "coc.preferences.diagnostic.errorSign": "", - "coc.preferences.diagnostic.warningSign": "", - "coc.preferences.noselect": false, - "json.format.enable": true, - "json.schemas": [ - { - "fileMatch": [ - "/deployment.jsonnet", - "/deployment.json" - ], - "url": "https://raw.githubusercontent.com/garethr/kubernetes-json-schema/master/v1.14.0/deployment.json" - } - ], - "yaml.schemas": { - "kubernetes": "/*.yaml" - }, - "languageserver": { - "bash": { - "command": "bash-language-server", - "args": ["start"], - "filetypes": ["sh"], - "ignoredRootPaths": ["~"] - }, - "ccls": { - "command": "ccls", - "filetypes": ["c", "cpp", "objc", "objcpp"], - "rootPatterns": [".ccls", "compile_commands.json", ".vim/", ".git/", ".hg/"], - "initializationOptions": { - "cacheDirectory": "/tmp/ccls" - } - }, - "dockerfile": { - "command": "docker-langserver", - "filetypes": ["dockerfile"], - "args": ["--stdio"] - }, - "golang": { - "command": "gopls", - "args": [], - "rootPatterns": ["go.mod", ".vim/", ".git/", ".hg/"], - "filetypes": ["go"] - }, - "terraform": { - "command": "terraform-lsp", - "filetypes": ["terraform"], - "initializationOptions": {} - } - } -} diff --git a/.config/nvim/colors/dln-dark.vim b/.config/nvim/colors/dln-dark.vim deleted file mode 100644 index acde81d..0000000 --- a/.config/nvim/colors/dln-dark.vim +++ /dev/null @@ -1,352 +0,0 @@ -" Theme setup -hi clear -syntax reset - -let g:colors_name = "dln-dark" - -let s:red_50 = "#ffebee" -let s:red_100 = "#ffcdd2" -let s:red_200 = "#ef9a9a" -let s:red_300 = "#e57373" -let s:red_400 = "#ef5350" -let s:red_500 = "#f44336" -let s:red_600 = "#e53935" -let s:red_700 = "#d32f2f" -let s:red_800 = "#c62828" -let s:red_900 = "#b71c1c" -let s:red_a100 = "#ff8a80" -let s:red_a200 = "#ff5252" -let s:red_a400 = "#ff1744" -let s:red_a700 = "#d50000" - -let s:pink_50 = "#fce4ec" -let s:pink_100 = "#f8bbd0" -let s:pink_200 = "#f48fb1" -let s:pink_300 = "#f06292" -let s:pink_400 = "#ec407a" -let s:pink_500 = "#e91e63" -let s:pink_600 = "#d81b60" -let s:pink_700 = "#c2185b" -let s:pink_800 = "#ad1457" -let s:pink_900 = "#880e4f" -let s:pink_a100 = "#ff80ab" -let s:pink_a200 = "#ff4081" -let s:pink_a400 = "#f50057" -let s:pink_a700 = "#c51162" - -let s:purple_50 = "#f3e5f5" -let s:purple_100 = "#e1bee7" -let s:purple_200 = "#ce93d8" -let s:purple_300 = "#ba68c8" -let s:purple_400 = "#ab47bc" -let s:purple_500 = "#9c27b0" -let s:purple_600 = "#8e24aa" -let s:purple_700 = "#7b1fa2" -let s:purple_800 = "#6a1b9a" -let s:purple_900 = "#4a148c" -let s:purple_a100 = "#ea80fc" -let s:purple_a200 = "#e040fb" -let s:purple_a400 = "#d500f9" -let s:purple_a700 = "#aa00ff" - -let s:deep_purple_50 = "#ede7f6" -let s:deep_purple_100 = "#d1c4e9" -let s:deep_purple_200 = "#b39ddb" -let s:deep_purple_300 = "#9575cd" -let s:deep_purple_400 = "#7e57c2" -let s:deep_purple_500 = "#673ab7" -let s:deep_purple_600 = "#5e35b1" -let s:deep_purple_700 = "#512da8" -let s:deep_purple_800 = "#4527a0" -let s:deep_purple_900 = "#311b92" -let s:deep_purple_a100 = "#b388ff" -let s:deep_purple_a200 = "#7c4dff" -let s:deep_purple_a400 = "#651fff" -let s:deep_purple_a700 = "#6200ea" - -let s:indigo_50 = "#e8eaf6" -let s:indigo_100 = "#c5cae9" -let s:indigo_200 = "#9fa8da" -let s:indigo_300 = "#7986cb" -let s:indigo_400 = "#5c6bc0" -let s:indigo_500 = "#3f51b5" -let s:indigo_600 = "#3949ab" -let s:indigo_700 = "#303f9f" -let s:indigo_800 = "#283593" -let s:indigo_900 = "#1a237e" -let s:indigo_a100 = "#8c9eff" -let s:indigo_a200 = "#536dfe" -let s:indigo_a400 = "#3d5afe" -let s:indigo_a700 = "#304ffe" - -let s:blue_50 = "#e3f2fd" -let s:blue_100 = "#bbdefb" -let s:blue_200 = "#90caf9" -let s:blue_300 = "#64b5f6" -let s:blue_400 = "#42a5f5" -let s:blue_500 = "#2196f3" -let s:blue_600 = "#1e88e5" -let s:blue_700 = "#1976d2" -let s:blue_800 = "#1565c0" -let s:blue_900 = "#0d47a1" -let s:blue_a100 = "#82b1ff" -let s:blue_a200 = "#448aff" -let s:blue_a400 = "#2979ff" -let s:blue_a700 = "#2962ff" - -let s:light_blue_50 = "#e1f5fe" -let s:light_blue_100 = "#b3e5fc" -let s:light_blue_200 = "#81d4fa" -let s:light_blue_300 = "#4fc3f7" -let s:light_blue_400 = "#29b6fc" -let s:light_blue_500 = "#03a9f4" -let s:light_blue_600 = "#039be5" -let s:light_blue_700 = "#0288d1" -let s:light_blue_800 = "#0277bd" -let s:light_blue_900 = "#01579b" -let s:light_blue_a100 = "#80d8ff" -let s:light_blue_a200 = "#40c4ff" -let s:light_blue_a400 = "#00b0ff" -let s:light_blue_a700 = "#0091ea" - -let s:cyan_50 = "#e0f7fa" -let s:cyan_100 = "#b2ebf2" -let s:cyan_200 = "#80deea" -let s:cyan_300 = "#4dd0e1" -let s:cyan_400 = "#26c6da" -let s:cyan_500 = "#00bcd4" -let s:cyan_600 = "#00acc1" -let s:cyan_700 = "#0097a7" -let s:cyan_800 = "#00838f" -let s:cyan_900 = "#006064" -let s:cyan_a100 = "#84ffff" -let s:cyan_a200 = "#18ffff" -let s:cyan_a400 = "#00e5ff" -let s:cyan_a700 = "#00b8d4" - -let s:teal_50 = "#e0f2f1" -let s:teal_100 = "#b2dfdb" -let s:teal_200 = "#80cbc4" -let s:teal_300 = "#4db6ac" -let s:teal_400 = "#26a69a" -let s:teal_500 = "#009688" -let s:teal_600 = "#00897b" -let s:teal_700 = "#00796b" -let s:teal_800 = "#00695c" -let s:teal_900 = "#004d40" -let s:teal_a100 = "#a7ffeb" -let s:teal_a200 = "#64ffda" -let s:teal_a400 = "#1de9b6" -let s:teal_a700 = "#00bfa5" - -let s:green_50 = "#e8f5e9" -let s:green_100 = "#c8e6c9" -let s:green_200 = "#a5d6a7" -let s:green_300 = "#81c784" -let s:green_400 = "#66bb6a" -let s:green_500 = "#4caf50" -let s:green_600 = "#43a047" -let s:green_700 = "#388e3c" -let s:green_800 = "#2e7d32" -let s:green_900 = "#1b5e20" -let s:green_a100 = "#b9f6ca" -let s:green_a200 = "#69f0ae" -let s:green_a400 = "#00e676" -let s:green_a700 = "#00c853" - -let s:light_green_50 = "#f1f8e9" -let s:light_green_100 = "#dcedc8" -let s:light_green_200 = "#c5e1a5" -let s:light_green_300 = "#aed581" -let s:light_green_400 = "#9ccc65" -let s:light_green_500 = "#8bc34a" -let s:light_green_600 = "#7cb342" -let s:light_green_700 = "#689f38" -let s:light_green_800 = "#558b2f" -let s:light_green_900 = "#33691e" -let s:light_green_a100 = "#ccff90" -let s:light_green_a200 = "#b2ff59" -let s:light_green_a400 = "#76ff03" -let s:light_green_a700 = "#64dd17" - -let s:lime_50 = "#f9fbe7" -let s:lime_100 = "#f0f4c3" -let s:lime_200 = "#e6ee9c" -let s:lime_300 = "#dce775" -let s:lime_400 = "#d4e157" -let s:lime_500 = "#cddc39" -let s:lime_600 = "#c0ca33" -let s:lime_700 = "#a4b42b" -let s:lime_800 = "#9e9d24" -let s:lime_900 = "#827717" -let s:lime_a100 = "#f4ff81" -let s:lime_a200 = "#eeff41" -let s:lime_a400 = "#c6ff00" -let s:lime_a700 = "#aeea00" - -let s:yellow_50 = "#fffde7" -let s:yellow_100 = "#fff9c4" -let s:yellow_200 = "#fff590" -let s:yellow_300 = "#fff176" -let s:yellow_400 = "#ffee58" -let s:yellow_500 = "#ffeb3b" -let s:yellow_600 = "#fdd835" -let s:yellow_700 = "#fbc02d" -let s:yellow_800 = "#f9a825" -let s:yellow_900 = "#f57f17" -let s:yellow_a100 = "#ffff82" -let s:yellow_a200 = "#ffff00" -let s:yellow_a400 = "#ffea00" -let s:yellow_a700 = "#ffd600" - -let s:amber_50 = "#fff8e1" -let s:amber_100 = "#ffecb3" -let s:amber_200 = "#ffe082" -let s:amber_300 = "#ffd54f" -let s:amber_400 = "#ffca28" -let s:amber_500 = "#ffc107" -let s:amber_600 = "#ffb300" -let s:amber_700 = "#ffa000" -let s:amber_800 = "#ff8f00" -let s:amber_900 = "#ff6f00" -let s:amber_a100 = "#ffe57f" -let s:amber_a200 = "#ffd740" -let s:amber_a400 = "#ffc400" -let s:amber_a700 = "#ffab00" - -let s:orange_50 = "#fff3e0" -let s:orange_100 = "#ffe0b2" -let s:orange_200 = "#ffcc80" -let s:orange_300 = "#ffb74d" -let s:orange_400 = "#ffa726" -let s:orange_500 = "#ff9800" -let s:orange_600 = "#fb8c00" -let s:orange_700 = "#f57c00" -let s:orange_800 = "#ef6c00" -let s:orange_900 = "#e65100" -let s:orange_a100 = "#ffd180" -let s:orange_a200 = "#ffab40" -let s:orange_a400 = "#ff9100" -let s:orange_a700 = "#ff6d00" - -let s:deep_orange_50 = "#fbe9a7" -let s:deep_orange_100 = "#ffccbc" -let s:deep_orange_200 = "#ffab91" -let s:deep_orange_300 = "#ff8a65" -let s:deep_orange_400 = "#ff7043" -let s:deep_orange_500 = "#ff5722" -let s:deep_orange_600 = "#f4511e" -let s:deep_orange_700 = "#e64a19" -let s:deep_orange_800 = "#d84315" -let s:deep_orange_900 = "#bf360c" -let s:deep_orange_a100 = "#ff9e80" -let s:deep_orange_a200 = "#ff6e40" -let s:deep_orange_a400 = "#ff3d00" -let s:deep_orange_a700 = "#dd2600" - -let s:brown_50 = "#efebe9" -let s:brown_100 = "#d7ccc8" -let s:brown_200 = "#bcaaa4" -let s:brown_300 = "#a1887f" -let s:brown_400 = "#8d6e63" -let s:brown_500 = "#795548" -let s:brown_600 = "#6d4c41" -let s:brown_700 = "#5d4037" -let s:brown_800 = "#4e342e" -let s:brown_900 = "#3e2723" - -let s:grey_50 = "#fafafa" -let s:grey_100 = "#f5f5f5" -let s:grey_200 = "#eeeeee" -let s:grey_300 = "#e0e0e0" -let s:grey_400 = "#bdbdbd" -let s:grey_500 = "#9e9e9e" -let s:grey_600 = "#757575" -let s:grey_700 = "#616161" -let s:grey_800 = "#424242" -let s:grey_900 = "#212121" -let s:black_1000 = "#000000" -let s:white_1000 = "#ffffff" - -let s:blue_grey_50 = "#eceff1" -let s:blue_grey_100 = "#cfd8dc" -let s:blue_grey_200 = "#b0bbc5" -let s:blue_grey_300 = "#90a4ae" -let s:blue_grey_400 = "#78909c" -let s:blue_grey_500 = "#607d8b" -let s:blue_grey_600 = "#546e7a" -let s:blue_grey_700 = "#455a64" -let s:blue_grey_800 = "#37474f" -let s:blue_grey_900 = "#263238" - - -" Highlighting function -fun! hi(group, guifg, guibg, attr) - if a:guifg != "" - exec "hi " . a:group . " guifg=" . a:guifg - endif - if a:guibg != "" - exec "hi " . a:group . " guibg=" . a:guibg - endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr - endif -endfun - -" FIXME: This needs doing - -call hi("Visual", s:cyan_a100, s:blue_900, "") -call hi("Folded", s:purple_100, s:purple_900, "") -call hi("NonText", s:grey_800, "", "") -call hi("Bookmark", s:black_1000, s:yellow_300, "none") -call hi("Todo", s:yellow_a100, s:yellow_900, "none") -call hi("SignColumn", s:blue_grey_100, s:black_1000, "") -call hi("VertSplit", s:blue_grey_800, s:blue_grey_300, "") -call hi("LineNr", s:blue_grey_700, s:black_1000, "italic") -call hi("CursorLine", "", "#171717", "") -call hi("CursorLineNR", s:blue_grey_200, s:blue_grey_900, "") -call hi("Normal", s:white_1000, "", "") -call hi("Bold", "", "", "bold") -call hi("Italic", "", "", "italic") -call hi("Boolean", s:orange_200, "", "") -call hi("Character", "", "", "") -call hi("Pmenu", s:light_green_50, s:blue_grey_800, "none") -call hi("PmenuSbar", s:light_green_50, s:blue_grey_800, "none") -call hi("PmenuSel", s:yellow_50, s:deep_purple_900, "") -call hi("Comment", s:blue_grey_400, "", "italic") -call hi("Conditional", "", "", "") -call hi("Constant", "", "", "") -call hi("Define", "", "", "") -call hi("Delimiter", "", "", "") -call hi("Float", "", "", "") -call hi("Function", s:blue_300, "", "bold") -call hi("Identifier", s:indigo_200, "", "") -call hi("Include", "", "", "") -call hi("Keyword", s:indigo_300, "", "") -call hi("Label", "", "", "") -call hi("Number", s:indigo_300, "", "") -call hi("Operator", s:cyan_200, "", "none") -call hi("PreProc", "", "", "") -call hi("Repeat", "", "", "") -call hi("Search", "", s:amber_700, "none") -call hi("Special", s:green_400, "", "") -call hi("SpecialChar", "", "", "") -call hi("Statement", s:indigo_100, "", "none") -call hi("StorageClass", "", "", "") -call hi("String", s:light_green_400, "", "italic") -call hi("Structure", "", "", "") -call hi("Tag", "", "", "") -call hi("Todo", "", "", "") -call hi("Type", s:cyan_200, "", "none") -call hi("Typedef", "", "", "") -call hi("goDeclaration", s:deep_purple_200, "", "none") -call hi("goReceiverType", s:cyan_200, "", "none") -call hi("goMethodCall", s:brown_100, "", "none") -call hi("goField", s:cyan_50, "", "none") -call hi("goFunctionCall", s:blue_grey_200, "", "none") -call hi("goSameId", s:lime_a400, "", "italic") -call hi("GitGutterAdd", s:light_green_500, "", "") -call hi("GitGutterChange",s:light_blue_300, "", "") -call hi("GitGutterDelete",s:yellow_300, "", "") -call hi("ALEErrorSign",s:black_1000, s:red_400, "none") -call hi("ALEWarningSign",s:orange_200, "", "none") diff --git a/.config/nvim/colors/dln-dim.vim b/.config/nvim/colors/dln-dim.vim deleted file mode 100644 index 3e22ec6..0000000 --- a/.config/nvim/colors/dln-dim.vim +++ /dev/null @@ -1,347 +0,0 @@ -" Theme setup -hi clear -syntax reset - -let g:colors_name = "dln-dim" - -let s:red_50 = "#ffebee" -let s:red_100 = "#ffcdd2" -let s:red_200 = "#ef9a9a" -let s:red_300 = "#e57373" -let s:red_400 = "#ef5350" -let s:red_500 = "#f44336" -let s:red_600 = "#e53935" -let s:red_700 = "#d32f2f" -let s:red_800 = "#c62828" -let s:red_900 = "#b71c1c" -let s:red_a100 = "#ff8a80" -let s:red_a200 = "#ff5252" -let s:red_a400 = "#ff1744" -let s:red_a700 = "#d50000" - -let s:pink_50 = "#fce4ec" -let s:pink_100 = "#f8bbd0" -let s:pink_200 = "#f48fb1" -let s:pink_300 = "#f06292" -let s:pink_400 = "#ec407a" -let s:pink_500 = "#e91e63" -let s:pink_600 = "#d81b60" -let s:pink_700 = "#c2185b" -let s:pink_800 = "#ad1457" -let s:pink_900 = "#880e4f" -let s:pink_a100 = "#ff80ab" -let s:pink_a200 = "#ff4081" -let s:pink_a400 = "#f50057" -let s:pink_a700 = "#c51162" - -let s:purple_50 = "#f3e5f5" -let s:purple_100 = "#e1bee7" -let s:purple_200 = "#ce93d8" -let s:purple_300 = "#ba68c8" -let s:purple_400 = "#ab47bc" -let s:purple_500 = "#9c27b0" -let s:purple_600 = "#8e24aa" -let s:purple_700 = "#7b1fa2" -let s:purple_800 = "#6a1b9a" -let s:purple_900 = "#4a148c" -let s:purple_a100 = "#ea80fc" -let s:purple_a200 = "#e040fb" -let s:purple_a400 = "#d500f9" -let s:purple_a700 = "#aa00ff" - -let s:deep_purple_50 = "#ede7f6" -let s:deep_purple_100 = "#d1c4e9" -let s:deep_purple_200 = "#b39ddb" -let s:deep_purple_300 = "#9575cd" -let s:deep_purple_400 = "#7e57c2" -let s:deep_purple_500 = "#673ab7" -let s:deep_purple_600 = "#5e35b1" -let s:deep_purple_700 = "#512da8" -let s:deep_purple_800 = "#4527a0" -let s:deep_purple_900 = "#311b92" -let s:deep_purple_a100 = "#b388ff" -let s:deep_purple_a200 = "#7c4dff" -let s:deep_purple_a400 = "#651fff" -let s:deep_purple_a700 = "#6200ea" - -let s:indigo_50 = "#e8eaf6" -let s:indigo_100 = "#c5cae9" -let s:indigo_200 = "#9fa8da" -let s:indigo_300 = "#7986cb" -let s:indigo_400 = "#5c6bc0" -let s:indigo_500 = "#3f51b5" -let s:indigo_600 = "#3949ab" -let s:indigo_700 = "#303f9f" -let s:indigo_800 = "#283593" -let s:indigo_900 = "#1a237e" -let s:indigo_a100 = "#8c9eff" -let s:indigo_a200 = "#536dfe" -let s:indigo_a400 = "#3d5afe" -let s:indigo_a700 = "#304ffe" - -let s:blue_50 = "#e3f2fd" -let s:blue_100 = "#bbdefb" -let s:blue_200 = "#90caf9" -let s:blue_300 = "#64b5f6" -let s:blue_400 = "#42a5f5" -let s:blue_500 = "#2196f3" -let s:blue_600 = "#1e88e5" -let s:blue_700 = "#1976d2" -let s:blue_800 = "#1565c0" -let s:blue_900 = "#0d47a1" -let s:blue_a100 = "#82b1ff" -let s:blue_a200 = "#448aff" -let s:blue_a400 = "#2979ff" -let s:blue_a700 = "#2962ff" - -let s:light_blue_50 = "#e1f5fe" -let s:light_blue_100 = "#b3e5fc" -let s:light_blue_200 = "#81d4fa" -let s:light_blue_300 = "#4fc3f7" -let s:light_blue_400 = "#29b6fc" -let s:light_blue_500 = "#03a9f4" -let s:light_blue_600 = "#039be5" -let s:light_blue_700 = "#0288d1" -let s:light_blue_800 = "#0277bd" -let s:light_blue_900 = "#01579b" -let s:light_blue_a100 = "#80d8ff" -let s:light_blue_a200 = "#40c4ff" -let s:light_blue_a400 = "#00b0ff" -let s:light_blue_a700 = "#0091ea" - -let s:cyan_50 = "#e0f7fa" -let s:cyan_100 = "#b2ebf2" -let s:cyan_200 = "#80deea" -let s:cyan_300 = "#4dd0e1" -let s:cyan_400 = "#26c6da" -let s:cyan_500 = "#00bcd4" -let s:cyan_600 = "#00acc1" -let s:cyan_700 = "#0097a7" -let s:cyan_800 = "#00838f" -let s:cyan_900 = "#006064" -let s:cyan_a100 = "#84ffff" -let s:cyan_a200 = "#18ffff" -let s:cyan_a400 = "#00e5ff" -let s:cyan_a700 = "#00b8d4" - -let s:teal_50 = "#e0f2f1" -let s:teal_100 = "#b2dfdb" -let s:teal_200 = "#80cbc4" -let s:teal_300 = "#4db6ac" -let s:teal_400 = "#26a69a" -let s:teal_500 = "#009688" -let s:teal_600 = "#00897b" -let s:teal_700 = "#00796b" -let s:teal_800 = "#00695c" -let s:teal_900 = "#004d40" -let s:teal_a100 = "#a7ffeb" -let s:teal_a200 = "#64ffda" -let s:teal_a400 = "#1de9b6" -let s:teal_a700 = "#00bfa5" - -let s:green_50 = "#e8f5e9" -let s:green_100 = "#c8e6c9" -let s:green_200 = "#a5d6a7" -let s:green_300 = "#81c784" -let s:green_400 = "#66bb6a" -let s:green_500 = "#4caf50" -let s:green_600 = "#43a047" -let s:green_700 = "#388e3c" -let s:green_800 = "#2e7d32" -let s:green_900 = "#1b5e20" -let s:green_a100 = "#b9f6ca" -let s:green_a200 = "#69f0ae" -let s:green_a400 = "#00e676" -let s:green_a700 = "#00c853" - -let s:light_green_50 = "#f1f8e9" -let s:light_green_100 = "#dcedc8" -let s:light_green_200 = "#c5e1a5" -let s:light_green_300 = "#aed581" -let s:light_green_400 = "#9ccc65" -let s:light_green_500 = "#8bc34a" -let s:light_green_600 = "#7cb342" -let s:light_green_700 = "#689f38" -let s:light_green_800 = "#558b2f" -let s:light_green_900 = "#33691e" -let s:light_green_a100 = "#ccff90" -let s:light_green_a200 = "#b2ff59" -let s:light_green_a400 = "#76ff03" -let s:light_green_a700 = "#64dd17" - -let s:lime_50 = "#f9fbe7" -let s:lime_100 = "#f0f4c3" -let s:lime_200 = "#e6ee9c" -let s:lime_300 = "#dce775" -let s:lime_400 = "#d4e157" -let s:lime_500 = "#cddc39" -let s:lime_600 = "#c0ca33" -let s:lime_700 = "#a4b42b" -let s:lime_800 = "#9e9d24" -let s:lime_900 = "#827717" -let s:lime_a100 = "#f4ff81" -let s:lime_a200 = "#eeff41" -let s:lime_a400 = "#c6ff00" -let s:lime_a700 = "#aeea00" - -let s:yellow_50 = "#fffde7" -let s:yellow_100 = "#fff9c4" -let s:yellow_200 = "#fff590" -let s:yellow_300 = "#fff176" -let s:yellow_400 = "#ffee58" -let s:yellow_500 = "#ffeb3b" -let s:yellow_600 = "#fdd835" -let s:yellow_700 = "#fbc02d" -let s:yellow_800 = "#f9a825" -let s:yellow_900 = "#f57f17" -let s:yellow_a100 = "#ffff82" -let s:yellow_a200 = "#ffff00" -let s:yellow_a400 = "#ffea00" -let s:yellow_a700 = "#ffd600" - -let s:amber_50 = "#fff8e1" -let s:amber_100 = "#ffecb3" -let s:amber_200 = "#ffe082" -let s:amber_300 = "#ffd54f" -let s:amber_400 = "#ffca28" -let s:amber_500 = "#ffc107" -let s:amber_600 = "#ffb300" -let s:amber_700 = "#ffa000" -let s:amber_800 = "#ff8f00" -let s:amber_900 = "#ff6f00" -let s:amber_a100 = "#ffe57f" -let s:amber_a200 = "#ffd740" -let s:amber_a400 = "#ffc400" -let s:amber_a700 = "#ffab00" - -let s:orange_50 = "#fff3e0" -let s:orange_100 = "#ffe0b2" -let s:orange_200 = "#ffcc80" -let s:orange_300 = "#ffb74d" -let s:orange_400 = "#ffa726" -let s:orange_500 = "#ff9800" -let s:orange_600 = "#fb8c00" -let s:orange_700 = "#f57c00" -let s:orange_800 = "#ef6c00" -let s:orange_900 = "#e65100" -let s:orange_a100 = "#ffd180" -let s:orange_a200 = "#ffab40" -let s:orange_a400 = "#ff9100" -let s:orange_a700 = "#ff6d00" - -let s:deep_orange_50 = "#fbe9a7" -let s:deep_orange_100 = "#ffccbc" -let s:deep_orange_200 = "#ffab91" -let s:deep_orange_300 = "#ff8a65" -let s:deep_orange_400 = "#ff7043" -let s:deep_orange_500 = "#ff5722" -let s:deep_orange_600 = "#f4511e" -let s:deep_orange_700 = "#e64a19" -let s:deep_orange_800 = "#d84315" -let s:deep_orange_900 = "#bf360c" -let s:deep_orange_a100 = "#ff9e80" -let s:deep_orange_a200 = "#ff6e40" -let s:deep_orange_a400 = "#ff3d00" -let s:deep_orange_a700 = "#dd2600" - -let s:brown_50 = "#efebe9" -let s:brown_100 = "#d7ccc8" -let s:brown_200 = "#bcaaa4" -let s:brown_300 = "#a1887f" -let s:brown_400 = "#8d6e63" -let s:brown_500 = "#795548" -let s:brown_600 = "#6d4c41" -let s:brown_700 = "#5d4037" -let s:brown_800 = "#4e342e" -let s:brown_900 = "#3e2723" - -let s:grey_50 = "#fafafa" -let s:grey_100 = "#f5f5f5" -let s:grey_200 = "#eeeeee" -let s:grey_300 = "#e0e0e0" -let s:grey_400 = "#bdbdbd" -let s:grey_500 = "#9e9e9e" -let s:grey_600 = "#757575" -let s:grey_700 = "#616161" -let s:grey_800 = "#424242" -let s:grey_900 = "#212121" -let s:black_1000 = "#000000" -let s:white_1000 = "#ffffff" - -let s:blue_grey_50 = "#eceff1" -let s:blue_grey_100 = "#cfd8dc" -let s:blue_grey_200 = "#b0bbc5" -let s:blue_grey_300 = "#90a4ae" -let s:blue_grey_400 = "#78909c" -let s:blue_grey_500 = "#607d8b" -let s:blue_grey_600 = "#546e7a" -let s:blue_grey_700 = "#455a64" -let s:blue_grey_800 = "#37474f" -let s:blue_grey_900 = "#263238" - - -" Highlighting function -fun! hi(group, guifg, guibg, attr) - if a:guifg != "" - exec "hi " . a:group . " guifg=" . a:guifg - endif - if a:guibg != "" - exec "hi " . a:group . " guibg=" . a:guibg - endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr - endif -endfun - -" FIXME: this is a todo - -call hi("Floating", s:blue_grey_400, "", "") -call hi("MsgArea", s:orange_900, "", "") -call hi("Normal", "#a1b0b8", "", "") -call hi("Bold", "", "", "bold") -call hi("Italic", "", "", "italic") -call hi("VertSplit", "#112131", s:blue_grey_800, "") -call hi("LineNr", s:grey_800, "", "italic") -call hi("NonText", s:blue_grey_900, "", "") -call hi("SignColumn", s:blue_grey_500, "transparent", "none") -call hi("Visual", s:cyan_100, s:indigo_900, "") -call hi("Search", "", s:amber_500, "none") - -call hi("Bookmark", s:black_1000, s:yellow_700, "none") -call hi("Todo", s:yellow_100, s:orange_900, "none") - -" call hi("CursorLine", "", "#112131", "") -" call hi("CursorLineNR", s:grey_500, "#334455", "") -call hi("CursorLine", "", "#011121", "") -call hi("CursorLineNR", s:blue_grey_500, "#112131", "") -call hi("Folded", s:purple_200, s:deep_purple_900, "") - -call hi("Pmenu", s:light_blue_500, "#0D3791", "none") -call hi("PmenuSbar", s:blue_grey_500, "#111c27", "none") -call hi("PmenuThumb", s:blue_grey_400, "#112131", "none") -" call hi("PmenuSel", s:light_blue_100, "#0D3771", "bold") -call hi("PmenuSel", s:light_blue_100, s:light_blue_800, "bold") - -call hi("CocFloating", s:light_blue_100, "#0D3771", "italic") - -call hi("GitGutterAdd", s:light_green_900, "", "italic") -call hi("GitGutterChange", s:light_blue_900, "", "italic") -call hi("GitGutterDelete", s:yellow_900, "", "italic") - -call hi("ALEErrorLine", s:orange_900, "", "italic") -call hi("ALEWarningLine", s:amber_200, "", "italic") -call hi("ALEErrorSign", s:red_700, "", "italic") -call hi("ALEWarningSign", s:amber_200, "", "italic") -call hi("ALEInfoSign", s:blue_grey_500, "", "italic") - -call hi("Statement", s:blue_grey_200, "", "bold") -call hi("String", s:light_green_400, "", "italic") -call hi("Comment", s:blue_grey_600, "", "bold,italic") -call hi("Type", s:deep_purple_100, "", "none") -call hi("Identifier", s:orange_200, "", "") -call hi("goFunction", s:blue_300, "", "bold") -call hi("goOperator", s:teal_200, "", "") -call hi("goSameId", s:yellow_100, "", "underline") - -call hi("Floating", s:red_200, "", "italic") - diff --git a/.config/nvim/colors/dln-light.vim b/.config/nvim/colors/dln-light.vim deleted file mode 100644 index 965f1d5..0000000 --- a/.config/nvim/colors/dln-light.vim +++ /dev/null @@ -1,354 +0,0 @@ -" Theme setup -hi clear -syntax reset - -let g:colors_name = "dln-dark" - -let s:red_50 = "#ffebee" -let s:red_100 = "#ffcdd2" -let s:red_200 = "#ef9a9a" -let s:red_300 = "#e57373" -let s:red_400 = "#ef5350" -let s:red_500 = "#f44336" -let s:red_600 = "#e53935" -let s:red_700 = "#d32f2f" -let s:red_800 = "#c62828" -let s:red_900 = "#b71c1c" -let s:red_a100 = "#ff8a80" -let s:red_a200 = "#ff5252" -let s:red_a400 = "#ff1744" -let s:red_a700 = "#d50000" - -let s:pink_50 = "#fce4ec" -let s:pink_100 = "#f8bbd0" -let s:pink_200 = "#f48fb1" -let s:pink_300 = "#f06292" -let s:pink_400 = "#ec407a" -let s:pink_500 = "#e91e63" -let s:pink_600 = "#d81b60" -let s:pink_700 = "#c2185b" -let s:pink_800 = "#ad1457" -let s:pink_900 = "#880e4f" -let s:pink_a100 = "#ff80ab" -let s:pink_a200 = "#ff4081" -let s:pink_a400 = "#f50057" -let s:pink_a700 = "#c51162" - -let s:purple_50 = "#f3e5f5" -let s:purple_100 = "#e1bee7" -let s:purple_200 = "#ce93d8" -let s:purple_300 = "#ba68c8" -let s:purple_400 = "#ab47bc" -let s:purple_500 = "#9c27b0" -let s:purple_600 = "#8e24aa" -let s:purple_700 = "#7b1fa2" -let s:purple_800 = "#6a1b9a" -let s:purple_900 = "#4a148c" -let s:purple_a100 = "#ea80fc" -let s:purple_a200 = "#e040fb" -let s:purple_a400 = "#d500f9" -let s:purple_a700 = "#aa00ff" - -let s:deep_purple_50 = "#ede7f6" -let s:deep_purple_100 = "#d1c4e9" -let s:deep_purple_200 = "#b39ddb" -let s:deep_purple_300 = "#9575cd" -let s:deep_purple_400 = "#7e57c2" -let s:deep_purple_500 = "#673ab7" -let s:deep_purple_600 = "#5e35b1" -let s:deep_purple_700 = "#512da8" -let s:deep_purple_800 = "#4527a0" -let s:deep_purple_900 = "#311b92" -let s:deep_purple_a100 = "#b388ff" -let s:deep_purple_a200 = "#7c4dff" -let s:deep_purple_a400 = "#651fff" -let s:deep_purple_a700 = "#6200ea" - -let s:indigo_50 = "#e8eaf6" -let s:indigo_100 = "#c5cae9" -let s:indigo_200 = "#9fa8da" -let s:indigo_300 = "#7986cb" -let s:indigo_400 = "#5c6bc0" -let s:indigo_500 = "#3f51b5" -let s:indigo_600 = "#3949ab" -let s:indigo_700 = "#303f9f" -let s:indigo_800 = "#283593" -let s:indigo_900 = "#1a237e" -let s:indigo_a100 = "#8c9eff" -let s:indigo_a200 = "#536dfe" -let s:indigo_a400 = "#3d5afe" -let s:indigo_a700 = "#304ffe" - -let s:blue_50 = "#e3f2fd" -let s:blue_100 = "#bbdefb" -let s:blue_200 = "#90caf9" -let s:blue_300 = "#64b5f6" -let s:blue_400 = "#42a5f5" -let s:blue_500 = "#2196f3" -let s:blue_600 = "#1e88e5" -let s:blue_700 = "#1976d2" -let s:blue_800 = "#1565c0" -let s:blue_900 = "#0d47a1" -let s:blue_a100 = "#82b1ff" -let s:blue_a200 = "#448aff" -let s:blue_a400 = "#2979ff" -let s:blue_a700 = "#2962ff" - -let s:light_blue_50 = "#e1f5fe" -let s:light_blue_100 = "#b3e5fc" -let s:light_blue_200 = "#81d4fa" -let s:light_blue_300 = "#4fc3f7" -let s:light_blue_400 = "#29b6fc" -let s:light_blue_500 = "#03a9f4" -let s:light_blue_600 = "#039be5" -let s:light_blue_700 = "#0288d1" -let s:light_blue_800 = "#0277bd" -let s:light_blue_900 = "#01579b" -let s:light_blue_a100 = "#80d8ff" -let s:light_blue_a200 = "#40c4ff" -let s:light_blue_a400 = "#00b0ff" -let s:light_blue_a700 = "#0091ea" - -let s:cyan_50 = "#e0f7fa" -let s:cyan_100 = "#b2ebf2" -let s:cyan_200 = "#80deea" -let s:cyan_300 = "#4dd0e1" -let s:cyan_400 = "#26c6da" -let s:cyan_500 = "#00bcd4" -let s:cyan_600 = "#00acc1" -let s:cyan_700 = "#0097a7" -let s:cyan_800 = "#00838f" -let s:cyan_900 = "#006064" -let s:cyan_a100 = "#84ffff" -let s:cyan_a200 = "#18ffff" -let s:cyan_a400 = "#00e5ff" -let s:cyan_a700 = "#00b8d4" - -let s:teal_50 = "#e0f2f1" -let s:teal_100 = "#b2dfdb" -let s:teal_200 = "#80cbc4" -let s:teal_300 = "#4db6ac" -let s:teal_400 = "#26a69a" -let s:teal_500 = "#009688" -let s:teal_600 = "#00897b" -let s:teal_700 = "#00796b" -let s:teal_800 = "#00695c" -let s:teal_900 = "#004d40" -let s:teal_a100 = "#a7ffeb" -let s:teal_a200 = "#64ffda" -let s:teal_a400 = "#1de9b6" -let s:teal_a700 = "#00bfa5" - -let s:green_50 = "#e8f5e9" -let s:green_100 = "#c8e6c9" -let s:green_200 = "#a5d6a7" -let s:green_300 = "#81c784" -let s:green_400 = "#66bb6a" -let s:green_500 = "#4caf50" -let s:green_600 = "#43a047" -let s:green_700 = "#388e3c" -let s:green_800 = "#2e7d32" -let s:green_900 = "#1b5e20" -let s:green_a100 = "#b9f6ca" -let s:green_a200 = "#69f0ae" -let s:green_a400 = "#00e676" -let s:green_a700 = "#00c853" - -let s:light_green_50 = "#f1f8e9" -let s:light_green_100 = "#dcedc8" -let s:light_green_200 = "#c5e1a5" -let s:light_green_300 = "#aed581" -let s:light_green_400 = "#9ccc65" -let s:light_green_500 = "#8bc34a" -let s:light_green_600 = "#7cb342" -let s:light_green_700 = "#689f38" -let s:light_green_800 = "#558b2f" -let s:light_green_900 = "#33691e" -let s:light_green_a100 = "#ccff90" -let s:light_green_a200 = "#b2ff59" -let s:light_green_a400 = "#76ff03" -let s:light_green_a700 = "#64dd17" - -let s:lime_50 = "#f9fbe7" -let s:lime_100 = "#f0f4c3" -let s:lime_200 = "#e6ee9c" -let s:lime_300 = "#dce775" -let s:lime_400 = "#d4e157" -let s:lime_500 = "#cddc39" -let s:lime_600 = "#c0ca33" -let s:lime_700 = "#a4b42b" -let s:lime_800 = "#9e9d24" -let s:lime_900 = "#827717" -let s:lime_a100 = "#f4ff81" -let s:lime_a200 = "#eeff41" -let s:lime_a400 = "#c6ff00" -let s:lime_a700 = "#aeea00" - -let s:yellow_50 = "#fffde7" -let s:yellow_100 = "#fff9c4" -let s:yellow_200 = "#fff590" -let s:yellow_300 = "#fff176" -let s:yellow_400 = "#ffee58" -let s:yellow_500 = "#ffeb3b" -let s:yellow_600 = "#fdd835" -let s:yellow_700 = "#fbc02d" -let s:yellow_800 = "#f9a825" -let s:yellow_900 = "#f57f17" -let s:yellow_a100 = "#ffff82" -let s:yellow_a200 = "#ffff00" -let s:yellow_a400 = "#ffea00" -let s:yellow_a700 = "#ffd600" - -let s:amber_50 = "#fff8e1" -let s:amber_100 = "#ffecb3" -let s:amber_200 = "#ffe082" -let s:amber_300 = "#ffd54f" -let s:amber_400 = "#ffca28" -let s:amber_500 = "#ffc107" -let s:amber_600 = "#ffb300" -let s:amber_700 = "#ffa000" -let s:amber_800 = "#ff8f00" -let s:amber_900 = "#ff6f00" -let s:amber_a100 = "#ffe57f" -let s:amber_a200 = "#ffd740" -let s:amber_a400 = "#ffc400" -let s:amber_a700 = "#ffab00" - -let s:orange_50 = "#fff3e0" -let s:orange_100 = "#ffe0b2" -let s:orange_200 = "#ffcc80" -let s:orange_300 = "#ffb74d" -let s:orange_400 = "#ffa726" -let s:orange_500 = "#ff9800" -let s:orange_600 = "#fb8c00" -let s:orange_700 = "#f57c00" -let s:orange_800 = "#ef6c00" -let s:orange_900 = "#e65100" -let s:orange_a100 = "#ffd180" -let s:orange_a200 = "#ffab40" -let s:orange_a400 = "#ff9100" -let s:orange_a700 = "#ff6d00" - -let s:deep_orange_50 = "#fbe9a7" -let s:deep_orange_100 = "#ffccbc" -let s:deep_orange_200 = "#ffab91" -let s:deep_orange_300 = "#ff8a65" -let s:deep_orange_400 = "#ff7043" -let s:deep_orange_500 = "#ff5722" -let s:deep_orange_600 = "#f4511e" -let s:deep_orange_700 = "#e64a19" -let s:deep_orange_800 = "#d84315" -let s:deep_orange_900 = "#bf360c" -let s:deep_orange_a100 = "#ff9e80" -let s:deep_orange_a200 = "#ff6e40" -let s:deep_orange_a400 = "#ff3d00" -let s:deep_orange_a700 = "#dd2600" - -let s:brown_50 = "#efebe9" -let s:brown_100 = "#d7ccc8" -let s:brown_200 = "#bcaaa4" -let s:brown_300 = "#a1887f" -let s:brown_400 = "#8d6e63" -let s:brown_500 = "#795548" -let s:brown_600 = "#6d4c41" -let s:brown_700 = "#5d4037" -let s:brown_800 = "#4e342e" -let s:brown_900 = "#3e2723" - -let s:grey_50 = "#fafafa" -let s:grey_100 = "#f5f5f5" -let s:grey_200 = "#eeeeee" -let s:grey_300 = "#e0e0e0" -let s:grey_400 = "#bdbdbd" -let s:grey_500 = "#9e9e9e" -let s:grey_600 = "#757575" -let s:grey_700 = "#616161" -let s:grey_800 = "#424242" -let s:grey_900 = "#212121" -let s:black_1000 = "#000000" -let s:white_1000 = "#ffffff" - -let s:blue_grey_50 = "#eceff1" -let s:blue_grey_100 = "#cfd8dc" -let s:blue_grey_200 = "#b0bbc5" -let s:blue_grey_300 = "#90a4ae" -let s:blue_grey_400 = "#78909c" -let s:blue_grey_500 = "#607d8b" -let s:blue_grey_600 = "#546e7a" -let s:blue_grey_700 = "#455a64" -let s:blue_grey_800 = "#37474f" -let s:blue_grey_900 = "#263238" - - -" Highlighting function -fun! hi(group, guifg, guibg, attr) - if a:guifg != "" - exec "hi " . a:group . " guifg=" . a:guifg - endif - if a:guibg != "" - exec "hi " . a:group . " guibg=" . a:guibg - endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr - endif -endfun - -" FIXME: This needs doing - -call hi("Visual", s:cyan_a100, s:blue_900, "") -call hi("Folded", s:purple_500, s:purple_900, "") -call hi("NonText", s:grey_800, "", "") -call hi("Bookmark", s:black_1000, s:yellow_300, "none") -call hi("Todo", s:yellow_a100, s:yellow_900, "none") -call hi("SignColumn", s:blue_grey_100, s:white_1000, "") -call hi("VertSplit", s:blue_grey_800, s:blue_grey_300, "") -call hi("LineNr", s:blue_grey_100, s:white_1000, "italic") -call hi("CursorLine", "", "#fafaf3", "") -call hi("CursorLineNR", s:blue_grey_200, "#eaeaea", "") -call hi("Normal", s:black_1000, "", "") -call hi("Bold", "", "", "bold") -call hi("Italic", "", "", "italic") -call hi("Boolean", s:deep_orange_900, "", "") -call hi("Character", "", "", "") -call hi("CocFloating", s:green_900, s:lime_200, "none") -call hi("Pmenu", s:black_1000, s:blue_grey_200, "none") -call hi("PmenuSbar", s:light_green_50, s:blue_grey_800, "none") -call hi("PmenuSel", s:black_1000, s:amber_300, "") -call hi("Comment", s:blue_grey_400, "", "italic") -call hi("Conditional", "", "", "") -call hi("Constant", "", "", "") -call hi("Define", "", "", "") -call hi("Delimiter", "", "", "") -call hi("Float", "", "", "") -call hi("Function", s:blue_700, "", "bold") -call hi("Identifier", s:indigo_800, "", "") -call hi("Include", "", "", "") -call hi("Keyword", s:indigo_800, "", "") -call hi("Label", "", "", "") -call hi("Number", s:indigo_300, "", "") -call hi("Operator", s:cyan_800, "", "none") -call hi("PreProc", "", "", "") -call hi("Repeat", "", "", "") -call hi("Search", "", s:amber_700, "none") -call hi("Special", s:green_400, "", "") -call hi("SpecialChar", "", "", "") -call hi("Statement", s:indigo_700, "", "none") -call hi("StorageClass", "", "", "") -call hi("String", s:green_800, "", "italic") -call hi("Structure", "", "", "") -call hi("Tag", "", "", "") -call hi("Todo", "", "", "") -call hi("Type", s:cyan_700, "", "none") -call hi("Typedef", "", "", "") -call hi("goDeclaration", s:deep_purple_900, "", "none") -call hi("goReceiverType", s:cyan_700, "", "none") -call hi("goMethodCall", s:purple_900, "", "none") -call hi("goField", s:cyan_900, "", "none") -call hi("goFunctionCall", s:deep_purple_500, "", "none") -call hi("goSameId", s:green_900, "#f7f9e0", "italic") -call hi("GitGutterAdd", s:light_green_500, "", "") -call hi("GitGutterChange",s:light_blue_300, "", "") -call hi("GitGutterDelete",s:yellow_300, "", "") -call hi("ALEErrorSign",s:black_1000, s:red_400, "none") -call hi("ALEWarningSign",s:orange_200, "", "none") -call hi("CursorColumn", "", s:yellow_50, "none") diff --git a/.config/nvim/colors/dln.vim b/.config/nvim/colors/dln.vim deleted file mode 120000 index 5d7ecb1..0000000 --- a/.config/nvim/colors/dln.vim +++ /dev/null @@ -1 +0,0 @@ -/home/dln/src/github.com/dln/nvim-highlite/colors/dln.vim \ No newline at end of file diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 671162e..ad915bc 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -1,555 +1,13 @@ -call plug#begin('~/.local/share/nvim/plugged') +lua require("init") -Plug 'tjdevries/colorbuddy.vim' -Plug 'tjdevries/gruvbuddy.nvim' -Plug '~/src/github.com/shelmangroup/nvim-shelman-theme' - -Plug 'neovim/nvim-lspconfig' -Plug 'nvim-lua/completion-nvim' -" Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} " update parsers on update -Plug 'steelsojka/completion-buffers' - -Plug 'junegunn/fzf', { 'do': './install --bin' } -Plug 'junegunn/fzf.vim' - -" Ansible -Plug 'pearofducks/ansible-vim' - -" Markdown -Plug 'jtratner/vim-flavored-markdown' -Plug 'tpope/vim-markdown' - -" remove trailing whitespace -Plug 'bronson/vim-trailing-whitespace' - -" comment lines out (gc in visual mode) -Plug 'tomtom/tcomment_vim' - -" Golang -Plug 'fatih/vim-go' - -" Terraform -Plug 'jvirtanen/vim-hcl' -Plug 'hashivim/vim-terraform' - -" Jsonnet filetype plugin -Plug 'google/vim-jsonnet' - -" toml -Plug 'cespare/vim-toml' - -" Plug 'ervandew/supertab' -Plug 'google/vim-maktaba' -Plug 'junegunn/vim-easy-align' -Plug 'junegunn/goyo.vim' -Plug 'junegunn/vim-peekaboo' -Plug 'kshenoy/vim-signature' -Plug 'Matt-Deacalion/vim-systemd-syntax' -Plug 'NLKNguyen/papercolor-theme' -Plug 'tsandall/vim-rego' - -" Git -Plug 'airblade/vim-gitgutter' -Plug 'tpope/vim-fugitive' -Plug 'junegunn/gv.vim' - -call plug#end() - -" language en_US -set encoding=utf8 -set ffs=unix,dos,mac - -set ttimeout -set ttimeoutlen=0 -" set timeoutlen=150 -" set ttimeoutlen=100 - -filetype on " detect the type of file -filetype plugin indent on " load filetype plugins -syntax on - -set history=1000 " How many lines of history to remember -set viminfo='100,!,f1,\"100,:40,%,n~/.config/nvim/viminfo - -set isk+=_,$,@,%,#,- " none of these should be word dividers, so make them not be -set hidden -set tabstop=2 -set shiftwidth=2 -set smarttab -set expandtab -set softtabstop=2 -set autoindent -set copyindent -set smartindent " Don't mess with comments -set nojoinspaces -set ttyfast -set lazyredraw -set autochdir -set autoread "Reload files changed outside vim -set nofoldenable " disable folding -set title -set titlestring=%F%m\ %r\ %y - -" Wordwrap -" set formatoptions=l -" formatoptions: -" c - autowrap COMMENTS using textwidth -" r - insert comment leader (?) on -" o - insert comment leader on 'o' or 'O' -" q - gq formats comments (?) -" n - recon numbered lists -" v - wrap on blanks -" t - autowrap TEXT using textwidth -set fo=croqnvt - -set lbr -set backspace=eol,start,indent -"Backspace and cursor keys wrap to -set whichwrap+=<,>,h,l -set wrap - -"" GUI -set visualbell -set noerrorbells -set ruler -set cursorline -set guicursor=n-v-c:block,n-v-c:blinkon1,i-ci-ve:ver50,r-cr:hor20,o:hor50 - -set number " line numbers -set numberwidth=4 -set lz " lazy redraw -set so=7 "scope -set sidescroll=1 -set scrolloff=10 -set mouse=a -set switchbuf=usetab -set showtabline=1 -set selection=exclusive -set shortmess=atI -set wildmenu -set wildmode=list:longest -set wildignore=*.swp,*.bak,*.pyc,*.class -set splitbelow " Preview window -set splitright -set updatetime=500 - -let mapleader="," - -"" Session -let g:session_autosave = 'no' - -"" Fancy status line. -set laststatus=0 - -"" Powerline -"set rtp+=/home/dln/.vim/bundle/powerline/powerline/bindings/vim - -"" Markers / Signature -let g:SignatureMarkTextHL="Bookmark" - -"" Minibuffer -let g:miniBufExplModSelTarget = 1 -let g:miniBufExplorerMoreThanOne = 0 -let g:miniBufExplModSelTarget = 0 -let g:miniBufExplUseSingleClick = 1 -let g:miniBufExplMapWindowNavVim = 1 -let g:miniBufExplVSplit = 25 -let g:miniBufExplSplitBelow=1 - - -"" minimap -let g:minimap_auto_start = 1 - - -"" Searching -set showmatch -set incsearch -set ignorecase -set smartcase -set hlsearch - -"" Use ack for grepping -set grepprg=ag -let g:ackprg='ag -H --nocolor --nogroup' - -"" Bookmarks -let g:showmarks_enable=1 -let g:showmarks_include="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" - -" Errormarker -let errormarker_errorgroup = "ErrorMsg" -let errormarker_warninggroup = "Todo" - -"" Highlighting -map ,H :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' - \ . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" - \ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">" - -"" Hide some files -let g:explHideFiles='^\.,.*\.class$,.*\.swp$,.*\.pyc$,.*\.swo$,\.DS_Store$,/tmp/v\d\d*' -let g:explDetailedHelp=1 - -"" Backup -set backup -set backupcopy=yes -set backupdir=~/tmp/nvim/,~/tmp,/var/tmp,/tmp" -set directory=~/tmp/nvim/,~/tmp,/var/tmp,/tmp" -let myvar = strftime("%y%m%d-%H%M") -let myvar = "set backupext=_". myvar -execute myvar -au BufWritePre * let &backupext = substitute(expand("%:p"), "\/", "_", "g") - -set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*.class,*/target/*,*/.git/*" - - -map :Buffers -map :Buffers -map ; :Commits -map e :GitFiles -map d :Files -map f :History - -" map g :BLines -map / :Ag -map m :Marks - -"" Key bindings -cnorea wd w\|:bd - -nmap :set invnumber - -imap  -inoremap :wa -nnoremap :wa - - -" C-Left, C-right -map [1;5D -map [1;5C -nnoremap b -vnoremap b -nnoremap ghb -inoremap ghb -nnoremap w -vnoremap w -nnoremap ghw -inoremap ghw - -"" Align -" Start interactive EasyAlign in visual mode (e.g. vipga) -xmap ga (EasyAlign) -" Start interactive EasyAlign for a motion/text object (e.g. gaip) -nmap ga (EasyAlign) - -"" Comments -map :TComment -imap - -"" Git -let g:SCMDiffCommand = "git" -let VCSCommandDeleteOnHide = 1 -let g:git_branch_status_nogit="" -let g:git_branch_status_around="[]" -let g:git_branch_status_text="" -let g:git_branch_status_head_current=1 -let g:gitgutter_override_sign_column_highlight = 0 -let g:gitgutter_sign_added = '' -let g:gitgutter_sign_modified = '' -let g:gitgutter_sign_removed = '' -let g:gitgutter_sign_removed_first_line = '' -let g:gitgutter_sign_modified_removed = '' - - -"" Buffer navigation -" map ` :b# -map :b# - - -"" "Turn off search highlight -map :noh -map :noh -nmap ,/ :let @/="" - -"" -"" File types -"" - -au BufNewFile,BufRead manifest setlocal ft=json -au BufNewFile,BufRead *.aurora set filetype=python -au BufNewFile,BufRead *.avdl setlocal ft=avro-idl -au BufNewFile,BufRead *.avpr setlocal ft=json -au BufNewFile,BufRead *.bazel setlocal ft=bzl -au BufNewFile,BufRead *.cql set syntax=cql -au BufNewFile,BufRead *.go setlocal ft=go -au BufNewFile,BufRead *.g setlocal ft=antlr -au BufNewFile,BufRead *.js set ft=javascript -au BufNewFile,BufRead *.json setfiletype json -au BufNewFile,BufRead *.pig set filetype=pig syntax=pig -au BufNewFile,BufRead *.template setfiletype json -au BufNewFile,BufRead *.thrift setlocal ft=thrift -au BufNewFile,BufRead *.upstart set filetype=upstart -au BufNewFile,BufRead *.upstart.conf set filetype=upstart -au BufNewFile,BufRead SCons* set filetype=python - -"" JavaScript, Json -let g:vim_json_syntax_conceal = 0 - -"" Jsonnet - -let g:jsonnet_fmt_fail_silently = 0 -autocmd BufNewFile,BufAdd,BufRead *.libjsonnet setlocal ft=jsonnet - -" tags -set tags=./tags;/ - - -"" syntax and completion -nnoremap lua vim.lsp.buf.definition() -nnoremap K lua vim.lsp.buf.hover() -nnoremap gD lua vim.lsp.buf.implementation() -nnoremap lua vim.lsp.buf.signature_help() -nnoremap 1gD lua vim.lsp.buf.type_definition() -nnoremap gr lua vim.lsp.buf.references() -nnoremap g0 lua vim.lsp.buf.document_symbol() -nnoremap gW lua vim.lsp.buf.workspace_symbol() -nnoremap gd lua vim.lsp.buf.declaration() - - -:lua << EOF -local nvim_lsp = require('lspconfig') -local completion = require('completion') - -local on_attach = function(client, bufnr) - local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end - local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end - - completion.on_attach(); - - buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc') - - -- Mappings. - local opts = { noremap=true, silent=true } - buf_set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) - buf_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', opts) - buf_set_keymap('n', 'gh', 'lua vim.lsp.buf.hover()', opts) - buf_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) - buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', opts) - -- buf_set_keymap('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', opts) - -- buf_set_keymap('n', 'wr', 'lua vim.lsp.buf.remove_workspace_folder()', opts) - -- buf_set_keymap('n', 'wl', 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', opts) - -- buf_set_keymap('n', 'D', 'lua vim.lsp.buf.type_definition()', opts) - -- buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', opts) - -- buf_set_keymap('n', 'e', 'lua vim.lsp.diagnostic.show_line_diagnostics()', opts) - buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) - buf_set_keymap('n', '[d', 'lua vim.lsp.diagnostic.goto_prev()', opts) - buf_set_keymap('n', ']d', 'lua vim.lsp.diagnostic.goto_next()', opts) - -- buf_set_keymap('n', 'q', 'lua vim.lsp.diagnostic.set_loclist()', opts) - -- - -- -- Set some keybinds conditional on server capabilities - -- if client.resolved_capabilities.document_formatting then - -- buf_set_keymap("n", "f", "lua vim.lsp.buf.formatting()", opts) - -- elseif client.resolved_capabilities.document_range_formatting then - -- buf_set_keymap("n", "f", "lua vim.lsp.buf.range_formatting()", opts) - -- end - - -- Set autocommands conditional on server_capabilities - if client.resolved_capabilities.document_highlight then - vim.api.nvim_exec([[ - hi LspReferenceRead cterm=bold ctermbg=red guibg=LightYellow - hi LspReferenceText cterm=bold ctermbg=red guibg=LightYellow - hi LspReferenceWrite cterm=bold ctermbg=red guibg=LightYellow - augroup lsp_document_highlight - autocmd! * - autocmd CursorHold lua vim.lsp.buf.document_highlight() - autocmd CursorMoved lua vim.lsp.buf.clear_references() - augroup END - ]], false) - end -end - --- Use a loop to conveniently both setup defined servers --- and map buffer local keybindings when the language server attaches -local servers = { "cssls", "gopls", "jdtls", "vimls", "yamlls" } -for _, lsp in ipairs(servers) do - nvim_lsp[lsp].setup { on_attach = on_attach } -end - -require'lspconfig'.sumneko_lua.setup{ - cmd = {"lua-language-server"}; - on_attach = on_attach; -} - -require'lspconfig'.terraformls.setup{ - cmd = {'terraform-ls', 'serve'}; - on_attach = on_attach; -} -EOF - -" nmap (completion_smart_tab) -" nmap (completion_smart_s_tab) -" let g:completion_chain_complete_list = [ -" \{'complete_items': ['lsp', 'buffers', 'snippet']}, -" \{'mode': ''}, -" \{'mode': ''} -" \] - -inoremap pumvisible() ? "\" : "\" -inoremap pumvisible() ? "\" : "\" - - -" Use and to navigate through popup menu -inoremap pumvisible() ? "\" : "\" -inoremap pumvisible() ? "\" : "\" -imap (completion_smart_tab) -imap (completion_smart_s_tab) -imap (completion_trigger) - - -"" Diagnostics -let g:diagnostic_enable_virtual_text = 1 -let g:diagnostic_insert_delay = 1 -let g:diagnostic_virtual_text_prefix = '⟸ ' - -call sign_define("LspDiagnosticsErrorSign", {"text" : "🔥", "texthl" : "LspDiagnosticsError"}) -call sign_define("LspDiagnosticsWarningSign", {"text" : "🎃", "texthl" : "LspDiagnosticsWarning"}) -call sign_define("LspDiagnosticsInformationSign", {"text" : "I", "texthl" : "LspDiagnosticsInformation"}) -call sign_define("LspDiagnosticsHintSign", {"text" : "💡", "texthl" : "LspDiagnosticsHint"}) - -let g:completion_matching_strategy_list = ['exact', 'substring', 'fuzzy', 'all'] -set completeopt=menuone,noinsert,noselect -set shortmess+=c - -autocmd BufEnter * lua require'completion'.on_attach() - - -"" Treesitter - -lua < exe 'bw '.s:buf +function s:recompile_plugins() + luafile % + PackerCompile endfunction -let g:fzf_preview_window = '' -let g:fzf_layout = { 'up': '~40%', 'window': 'call CreateCenteredFloatingWindow()' } -let g:fzf_colors = -\ { 'fg': ['fg', 'Comment'], - \ 'bg': ['bg', 'Comment'], - \ 'hl': ['fg', 'Comment'], - \ 'fg+': ['fg', 'PMenuSel', 'PMenuSel', 'Normal'], - \ 'bg+': ['bg', 'PMenuSel', 'PMenuSel'], - \ 'hl+': ['fg', 'Statement'], - \ 'info': ['fg', 'PreProc'], - \ 'border': ['fg', 'Ignore'], - \ 'prompt': ['fg', 'Conditional'], - \ 'pointer': ['fg', 'Exception'], - \ 'marker': ['fg', 'Keyword'], - \ 'spinner': ['fg', 'Label'], - \ 'header': ['fg', 'Normal'] } +"" Autocommands -function! RipgrepFzf(query, fullscreen) - let command_fmt = 'rg --column --line-number --no-heading --color=always --smart-case %s || true' - let initial_command = printf(command_fmt, shellescape(a:query)) - let reload_command = printf(command_fmt, '{q}') - let spec = {'options': ['--phony', '--query', a:query, '--bind', 'change:reload:'.reload_command], 'window': { 'width': 0.9, 'height': 0.6 }} - call fzf#vim#grep(initial_command, 1, fzf#vim#with_preview(spec), a:fullscreen) -endfunction - -command! -nargs=* -bang RG call RipgrepFzf(, 0) - -map / :RG - -" Show syntax highlight group in the status bar -map ,h :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' -\ . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" -\ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">" - -set background=dark - -" Golang -let g:go_highlight_build_constraints = 1 -let g:go_highlight_extra_types = 1 -let g:go_highlight_fields = 1 -let g:go_highlight_functions = 1 -let g:go_highlight_function_calls = 1 -let g:go_highlight_interfaces = 1 -let g:go_highlight_methods = 1 -let g:go_highlight_operators = 1 -let g:go_highlight_structs = 1 -let g:go_highlight_types = 1 -let g:go_auto_sameids = 1 -let g:go_def_mode='gopls' -let g:go_info_mode='gopls' -let g:go_updatetime = 200 -let g:go_snippet_engine = "neosnippet" -" Let coc.nvim handle GoDef. -let g:go_def_mapping_enabled = 0 - -autocmd FileType go nmap i (go-info) -autocmd FileType go nmap (go-doc) -autocmd FileType go nmap d (go-doc-vertical) - - -" Hugo -let g:vim_markdown_frontmatter = 1 -let g:vim_markdown_toml_frontmatter = 1 - - - - -"" Terminal - -let $NVIM_TUI_ENABLE_TRUE_COLOR=1 -set termguicolors -let &t_8f = "\[38;2;%lu;%lu;%lum" -let &t_8b = "\[48;2;%lu;%lu;%lum" -" " undercurl in tmux -" set t_Cs = "\e[4:3m" -" set t_Ce = "\e[4:0m" - - -lua require('colorbuddy').colorscheme('shelman-light') - -map ,l :luafile % +augroup recompile_plugins + autocmd! + autocmd BufWritePost plugins.lua call recompile_plugins() +augroup END diff --git a/.config/nvim/lua/dln/lsp-config.lua b/.config/nvim/lua/dln/lsp-config.lua new file mode 100644 index 0000000..5979ba9 --- /dev/null +++ b/.config/nvim/lua/dln/lsp-config.lua @@ -0,0 +1,113 @@ +local lspconfig = require("lspconfig") +-- local configs = require("lspconfig.configs") +local util = require("lspconfig.util") + +vim.lsp.handlers["textDocument/publishDiagnostics"] = + vim.lsp.with( + vim.lsp.diagnostic.on_publish_diagnostics, + { + update_in_insert = false, + virtual_text = {prefix = ""} + } +) +vim.fn.sign_define( + "LspDiagnosticsSignError", + { + text = "🛑", + texthl = "LspDiagnosticsSignError" + } +) + +vim.fn.sign_define( + "LspDiagnosticsSignWarning", + { + text = "⚠", + texthl = "LspDiagnosticsSignWarning" + } +) +vim.fn.sign_define( + "LspDiagnosticsSignInformation", + { + text = "💡", + texthl = "LspDiagnosticsSignInformation" + } +) +vim.fn.sign_define( + "LspDiagnosticsSignHint", + { + text = "💡", + texthl = "LspDiagnosticsSignHint" + } +) + +local on_attach = function() + require("folding").on_attach() +end + +-- simple setups -- +local servers = { + "bashls", + "cssls", + "dockerls", + "gopls", + "html", + "jsonls", + -- "sql", + "sumneko_lua", + "terraformls", + "yamlls", +} + +for _, lsp in ipairs(servers) do + lspconfig[lsp].setup {on_attach = on_attach} +end + +local efm_prettier = { + formatCommand = "prettier --stdin-filepath ${INPUT}", + formatStdin = true +} + + +lspconfig.sumneko_lua.setup { + cmd = {"lua-language-server", "-E", "/usr/share/lua-language-server/main.lua"}, + settings = { + Lua = { + completion = {kewordSnippet = "Disable"}, + diagnostics = { + enable = true, + globals = {"renoise", "use", "vim"} + }, + runtime = { + version = "LuaJIT", + path = {"?.lua", "?/init.lua", "?/?.lua"} + }, + workspace = { + library = { + [vim.fn.expand("$VIMRUNTIME/lua")] = true, + [vim.fn.expand("$VIMRUNTIME/lua/vim/lsp")] = true, + [vim.fn.stdpath("config") .. "/lua"] = true, + [vim.fn.stdpath("data") .. "/site/pack"] = true + }, + maxPreload = 2000, + preloadFileSize = 1000 + } + } + } +} + +lspconfig.yamlls.setup { + on_attach = on_attach, + settings = { + yaml = { + format = {enable = true, singleQuote = true}, + schemaStore = {enable = true}, + schemas = { + ["https://json.schemastore.org/github-workflow"] = "*.github/workflows/*", + ["https://json.schemastore.org/kustomization.json"] = "kustomization.yaml", + ["https://json.schemastore.org/ansible-role-2.9.json"] = "*/tasks/*.y*ml", + ["kubernetes" ] = "*.yaml", + }, + validate = true + } + } +} diff --git a/.config/nvim/lua/dln/lspsaga.lua b/.config/nvim/lua/dln/lspsaga.lua new file mode 100644 index 0000000..173bad0 --- /dev/null +++ b/.config/nvim/lua/dln/lspsaga.lua @@ -0,0 +1,8 @@ +require("lspsaga").init_lsp_saga { + use_saga_diagnostic_sign = false, + -- error_sign = "", + -- warn_sign = "", + -- infor_sign = "", + -- hint_sign = "➤", + code_action_prompt = {enable = false} +} diff --git a/.config/nvim/lua/dln/telescope.lua b/.config/nvim/lua/dln/telescope.lua new file mode 100644 index 0000000..89d6f44 --- /dev/null +++ b/.config/nvim/lua/dln/telescope.lua @@ -0,0 +1,60 @@ +local telescope = require("telescope") +local actions = require("telescope.actions") +local previewers = require("telescope.previewers") + +-- Setup +telescope.setup { + defaults = { + layout_strategy = "flex", + -- layout_defaults = {flip_columns = 160}, + preview_cutoff = 10, + results_height = 1, + mappings = { + i = { + [""] = actions.select_default + actions.center, + [""] = actions.close, + [""] = actions.add_selection + } + }, + color_devicons = true, + file_previewer = previewers.vim_buffer_cat.new, + grep_previewer = previewers.vim_buffer_vimgrep.new, + qflist_previewer = previewers.vim_buffer_qflist.new + } +} + +-- TODO: Reduce preview ratio +-- Override flex layout +local layout_strategies = require("telescope.pickers.layout_strategies") +local config = require("telescope.config") + +layout_strategies.flex = function(self, max_columns, max_lines) + local layout_config = self.layout_config or {} + + local flip_columns = layout_config.flip_columns or 160 -- Here's why. + local flip_lines = layout_config.flip_lines or 20 + + if max_columns < flip_columns and max_lines > flip_lines then + self.layout_config = (config.values.layout_defaults or {})["vertical"] + return layout_strategies.vertical(self, max_columns, max_lines) + else + self.layout_config = (config.values.layout_defaults or {})["horizontal"] + return layout_strategies.horizontal(self, max_columns, max_lines) + end +end + +-- Extensions +telescope.load_extension("fzy_native") +telescope.load_extension("gh") +-- telescope.load_extension("packer") -- currently breaking packer + +local M = {} + +-- Pickers +M.project_files = function() + require("telescope.builtin").find_files { + cwd = require("lspconfig.util").root_pattern(".git")(vim.fn.expand("%:p")) + } +end + +return M diff --git a/.config/nvim/lua/dln/treesitter.lua b/.config/nvim/lua/dln/treesitter.lua new file mode 100644 index 0000000..5d8e5c0 --- /dev/null +++ b/.config/nvim/lua/dln/treesitter.lua @@ -0,0 +1,56 @@ +require("nvim-treesitter.configs").setup { + ensure_installed = "maintained", + highlight = {enable = true}, + textobjects = { + move = { + enable = true, + goto_next_start = { + ["]m"] = "@function.outer", + ["]]"] = "@class.outer" + }, + goto_next_end = { + ["]M"] = "@function.outer", + ["]["] = "@class.outer" + }, + goto_previous_start = { + ["[m"] = "@function.outer", + ["[["] = "@class.outer" + }, + goto_previous_end = { + ["[M"] = "@function.outer", + ["[]"] = "@class.outer" + } + }, + select = { + enable = true, + keymaps = { + -- You can use the capture groups defined in textobjects.scm + ["af"] = "@function.outer", + ["if"] = "@function.inner", + ["ac"] = "@class.outer", + ["ic"] = "@class.inner", + -- Or you can define your own textobjects like this + ["iF"] = { + python = "(function_definition) @function", + cpp = "(function_definition) @function", + c = "(function_definition) @function", + java = "(method_declaration) @function" + } + } + }, + swap = { + enable = true, + swap_next = { + ["l"] = "@parameter.inner" + }, + swap_previous = { + ["h"] = "@parameter.inner" + } + } + }, + --- nvim-ts-autotag --- + autotag = { + enable = true, + filetypes = {"html", "javascriptreact", "xml"} + } +} diff --git a/.config/nvim/lua/dln/utils.lua b/.config/nvim/lua/dln/utils.lua new file mode 100644 index 0000000..fc80c16 --- /dev/null +++ b/.config/nvim/lua/dln/utils.lua @@ -0,0 +1,19 @@ +local M = {} + +function M.term_codes(s) + return vim.api.nvim_replace_termcodes(s, true, true, true) +end + +function M.map(mode, lhs, rhs, opts) + opts = vim.tbl_extend("force", {noremap = true}, opts or {}) + for i = 1, #mode do + vim.api.nvim_set_keymap(mode:sub(i, i), lhs, rhs, opts) + end +end + +function M.mapx(mode, lhs, rhs, opts) + opts = vim.tbl_extend("force", {expr = true, silent = true}, opts or {}) + return M.map(mode, lhs, rhs, opts) +end + +return M diff --git a/.config/nvim/lua/init.lua b/.config/nvim/lua/init.lua new file mode 100644 index 0000000..14a21d6 --- /dev/null +++ b/.config/nvim/lua/init.lua @@ -0,0 +1,62 @@ +vim.bo.undofile = true +vim.cmd('set completeopt-=preview') +vim.cmd('set viewoptions-=options') +vim.g.mapleader = ',' +vim.o.clipboard = 'unnamed' +vim.o.hidden = true +vim.o.mouse = 'a' +vim.o.splitbelow = true +vim.o.splitright = true +vim.o.ttimeout = true +vim.o.ttimeoutlen = 50 +vim.o.updatetime = 100 +vim.o.autochdir = true +vim.o.backupdir = "/home/dln/.local/share/nvim/backup//" + +--- Indent +vim.bo.expandtab = true +vim.bo.smartindent = true +vim.o.joinspaces = false +vim.o.listchars = 'extends:›,precedes:‹,nbsp:·,tab:→ ,trail:·' +vim.wo.foldlevel = 99 +vim.wo.linebreak = true +vim.wo.list = true +vim.o.shiftwidth = 4 +vim.o.tabstop = 4 +vim.o.softtabstop = 4 + +--- Search +vim.cmd('set path+=**') +vim.cmd('set wildignore+=*/tmp/*,/var/*,*.so,*.swp,*.zip,*.tar,*.pyc') +vim.o.ignorecase = true +vim.o.smartcase = true +vim.o.wildmode = 'longest:full,full' + +if vim.fn.executable('rg') then + vim.o.grepprg = 'rg --vimgrep --no-heading --smart-case' +end + +--- Completion +vim.cmd('set shortmess+=c') +vim.o.completeopt = 'menuone,noinsert,noselect' + +--- Appearance +vim.o.background = 'light' +vim.o.scrolloff = 8 +vim.o.showmode = false +vim.o.sidescrolloff = 5 +vim.o.termguicolors = true +vim.wo.cursorline = true +vim.wo.number = true + +--- Key mappings +local map = require("dln.utils").map +map('n', '', ':let @/=""') -- clear search +map('n', 'H', '^') +map('n', 'L', '$') +map('i', '', '') + +--- Plugins +vim.g.netrw_dirhistmax = 0 + +require('plugins') diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua new file mode 100644 index 0000000..26e8515 --- /dev/null +++ b/.config/nvim/lua/plugins.lua @@ -0,0 +1,147 @@ +return require('packer').startup(function() + use "pierreglaser/folding-nvim" + use 'tjdevries/colorbuddy.vim' + use 'wbthomason/packer.nvim' + + use { + 'b3nj5m1n/kommentary', + config = function() + require('kommentary.config').use_extended_mappings() + vim.api.nvim_set_keymap("n", "", "kommentary_line_default", {}) -- C-/ + vim.api.nvim_set_keymap("v", "", "kommentary_visual_default", {}) -- C-/ + end + } + + use { + "glepnir/lspsaga.nvim", + config = function() + require("dln.lspsaga") + + local map = require("dln.utils").map + local o = {silent = true} + map("n", "gh", ":Lspsaga lsp_finder", o) + map("n", "ca", ":Lspsaga code_action", o) + -- map("n", "k", ":Lspsaga hover_doc", o) + map("n", "gs", ":Lspsaga signature_help", o) + map("n", "gr", ":Lspsaga rename", o) + map("n", "gd", ":Lspsaga preview_definition", o) + map("n", "cd", ":Lspsaga show_line_diagnostics", o) + map("n", "[d", ":Lspsaga diagnostic_jump_prev", o) + map("n", "]d", ":Lspsaga diagnostic_jump_next", o) + end + } + + use { + "hrsh7th/nvim-compe", + config = function() + require("compe").setup { + min_length = 0, + source = { + buffer = true, + nvim_lsp = true, + nvim_lua = true, + } + } + local utils = require("dln.utils") + local check_behind = function() + local is_empty = function(col) + return col <= 0 or vim.fn.getline("."):sub(col, col):match("%s") + end + local pos_col = vim.fn.col(".") - 1 + return is_empty(pos_col) and is_empty(pos_col - 1) and true or false + end + + _G.complete = function(pum, empty) + if vim.fn.pumvisible() == 1 then + return utils.term_codes(pum) + elseif check_behind() then + return utils.term_codes(empty) + else + return vim.fn["compe#complete"]() + end + end + + utils.mapx("is", "", "v:lua.complete('', '')") + utils.mapx("is", "", "v:lua.complete('', '')") + utils.mapx("x", "", "compe:#confirm('", "compe#close('')") + end + } + + + use { + "lukas-reineke/indent-blankline.nvim", + branch = "lua", + config = function() + -- vim.wo.colorcolumn = "100" + vim.g.indent_blankline_char = "│" + vim.g.indent_blankline_space_char = "⬝" + vim.g.indent_blankline_space_char_highlight_list = { 'IndentSpace' } + -- vim.g.indent_blankline_char_list = {'|', '¦', '┆', '┊'} + vim.g.indent_blankline_buftype_exclude = {"help", "terminal"} + vim.g.indent_blankline_filetype_exclude = {"text", "markdown"} + -- vim.g.indent_blankline_show_end_of_line = true + vim.g.indent_blankline_show_first_indent_level = true + vim.g.indent_blankline_show_trailing_blankline_indent = true + vim.g.indent_blankline_char_highlight_list = { 'Indent1', 'Indent2', 'Indent3', 'Indent4'} + end + } + + use { + 'neovim/nvim-lspconfig', + config = function() + require('dln.lsp-config') + local map = require('dln.utils').map + map('n', 'K', 'lua vim.lsp.buf.hover()') + map('i', '', 'lua vim.lsp.buf.signature_help()') + map('n', 'gd', 'lua vim.lsp.buf.definition()') + map('n', '1gd', 'lua vim.lsp.buf.type_definition()') + map('n', 'gr', 'lua vim.lsp.buf.references()') + map('n', 'g0', 'lua vim.lsp.buf.document_symbol()') + map('n', 'gf', 'lua vim.lsp.buf.formatting()') + end + } + + use { + 'nvim-telescope/telescope.nvim', + requires = { + 'nvim-lua/popup.nvim', + 'nvim-lua/plenary.nvim', + 'nvim-telescope/telescope-fzy-native.nvim', + 'nvim-telescope/telescope-github.nvim' + }, + config = function() + require('dln.telescope') + local map = require('dln.utils').map + map('n', '', 'lua require("telescope.builtin").buffers()') + map('n', 'b', 'lua require("telescope.builtin").buffers()') + map('n', 'f', 'lua require("telescope.builtin").oldfiles()') + map('n', 'e', 'lua require("telescope.builtin").git_files()') + map('n', 's', 'lua require("telescope.builtin").lsp_document_symbols()') + map('n', 't', 'lua require("telescope.builtin").treesitter()') + end + } + + use { + "nvim-treesitter/nvim-treesitter", + run = ":TSUpdate", + requires = { + "nvim-treesitter/nvim-treesitter-textobjects", + "windwp/nvim-ts-autotag" + }, + config = function() + require("dln.treesitter") + vim.wo.foldmethod = "expr" + vim.wo.foldexpr = "nvim_treesitter#foldexpr()" + end + } + + use { + "~/src/github.com/shelmangroup/nvim-shelman-theme", + requires ={{'tjdevries/colorbuddy.vim'}}, + config = function() + require('colorbuddy').colorscheme('shelman-light') + end + } + +end) diff --git a/.config/nvim/plugin/packer_compiled.vim b/.config/nvim/plugin/packer_compiled.vim new file mode 100644 index 0000000..732c95d --- /dev/null +++ b/.config/nvim/plugin/packer_compiled.vim @@ -0,0 +1,136 @@ +" Automatically generated packer.nvim plugin loader code + +if !has('nvim-0.5') + echohl WarningMsg + echom "Invalid Neovim version for packer.nvim!" + echohl None + finish +endif + +packadd packer.nvim + +try + +lua << END +local package_path_str = "/home/dln/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/dln/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/dln/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/dln/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/dln/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" +if not string.find(package.path, package_path_str, 1, true) then + package.path = package.path .. ';' .. package_path_str +end + +if not string.find(package.cpath, install_cpath_pattern, 1, true) then + package.cpath = package.cpath .. ';' .. install_cpath_pattern +end + +local function try_loadstring(s, component, name) + local success, result = pcall(loadstring(s)) + if not success then + print('Error running ' .. component .. ' for ' .. name) + error(result) + end + return result +end + +_G.packer_plugins = { + ["colorbuddy.vim"] = { + loaded = true, + path = "/home/dln/.local/share/nvim/site/pack/packer/start/colorbuddy.vim" + }, + ["folding-nvim"] = { + loaded = true, + path = "/home/dln/.local/share/nvim/site/pack/packer/start/folding-nvim" + }, + ["indent-blankline.nvim"] = { + config = { "\27LJ\2\n\4\0\0\2\0\16\0!6\0\0\0009\0\1\0'\1\3\0=\1\2\0006\0\0\0009\0\1\0'\1\5\0=\1\4\0006\0\0\0009\0\1\0005\1\a\0=\1\6\0006\0\0\0009\0\1\0005\1\t\0=\1\b\0006\0\0\0009\0\1\0005\1\v\0=\1\n\0006\0\0\0009\0\1\0+\1\2\0=\1\f\0006\0\0\0009\0\1\0+\1\2\0=\1\r\0006\0\0\0009\0\1\0005\1\15\0=\1\14\0K\0\1\0\1\5\0\0\fIndent1\fIndent2\fIndent3\fIndent4)indent_blankline_char_highlight_list4indent_blankline_show_trailing_blankline_indent-indent_blankline_show_first_indent_level\1\3\0\0\ttext\rmarkdown&indent_blankline_filetype_exclude\1\3\0\0\thelp\rterminal%indent_blankline_buftype_exclude\1\2\0\0\16IndentSpace/indent_blankline_space_char_highlight_list\b⬝ indent_blankline_space_char\b│\26indent_blankline_char\6g\bvim\0" }, + loaded = true, + path = "/home/dln/.local/share/nvim/site/pack/packer/start/indent-blankline.nvim" + }, + kommentary = { + config = { "\27LJ\2\n\1\0\0\6\0\v\0\0226\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\3\0009\0\4\0009\0\5\0'\2\6\0'\3\a\0'\4\b\0004\5\0\0B\0\5\0016\0\3\0009\0\4\0009\0\5\0'\2\t\0'\3\a\0'\4\n\0004\5\0\0B\0\5\1K\0\1\0$kommentary_visual_default\6v\"kommentary_line_default\6\31\6n\20nvim_set_keymap\bapi\bvim\26use_extended_mappings\22kommentary.config\frequire\0" }, + loaded = true, + path = "/home/dln/.local/share/nvim/site/pack/packer/start/kommentary" + }, + ["lspsaga.nvim"] = { + config = { "\27LJ\2\n\4\0\0\b\0\22\00096\0\0\0'\2\1\0B\0\2\0016\0\0\0'\2\2\0B\0\2\0029\0\3\0005\1\4\0\18\2\0\0'\4\5\0'\5\6\0'\6\a\0\18\a\1\0B\2\5\1\18\2\0\0'\4\5\0'\5\b\0'\6\t\0\18\a\1\0B\2\5\1\18\2\0\0'\4\5\0'\5\n\0'\6\v\0\18\a\1\0B\2\5\1\18\2\0\0'\4\5\0'\5\f\0'\6\r\0\18\a\1\0B\2\5\1\18\2\0\0'\4\5\0'\5\14\0'\6\15\0\18\a\1\0B\2\5\1\18\2\0\0'\4\5\0'\5\16\0'\6\17\0\18\a\1\0B\2\5\1\18\2\0\0'\4\5\0'\5\18\0'\6\19\0\18\a\1\0B\2\5\1\18\2\0\0'\4\5\0'\5\20\0'\6\21\0\18\a\1\0B\2\5\1K\0\1\0&:Lspsaga diagnostic_jump_next\a]d&:Lspsaga diagnostic_jump_prev\a[d':Lspsaga show_line_diagnostics\15cd$:Lspsaga preview_definition\agd\24:Lspsaga rename\agr :Lspsaga signature_help\ags\29:Lspsaga code_action\15ca\28:Lspsaga lsp_finder\agh\6n\1\0\1\vsilent\2\bmap\14dln.utils\16dln.lspsaga\frequire\0" }, + loaded = true, + path = "/home/dln/.local/share/nvim/site/pack/packer/start/lspsaga.nvim" + }, + ["nvim-compe"] = { + config = { "\27LJ\2\n}\0\1\6\0\a\0\22)\1\0\0\2\0\1\0X\1\176\1\0\0009\1\1\0019\1\2\1'\3\3\0B\1\2\2\18\3\1\0009\1\4\1\18\4\0\0\18\5\0\0B\1\4\2\18\3\1\0009\1\5\1'\4\6\0B\1\3\2X\2\3+\1\1\0X\2\1+\1\2\0L\1\2\0\a%s\nmatch\bsub\6.\fgetline\afn\bvimn\1\0\5\0\5\1\0223\0\0\0006\1\1\0009\1\2\0019\1\3\1'\3\4\0B\1\2\2\23\1\0\1\18\2\0\0\18\4\1\0B\2\2\2\15\0\2\0X\3\a\18\2\0\0\23\4\0\1B\2\2\2\15\0\2\0X\3\2+\2\2\0X\3\1+\2\1\0002\0\0L\2\2\0\6.\bcol\afn\bvim\0\2\1\0\2\5\2\5\1\0256\2\0\0009\2\1\0029\2\2\2B\2\1\2\t\2\0\0X\2\5-\2\0\0009\2\3\2\18\4\0\0D\2\2\0X\2\r-\2\1\0B\2\1\2\15\0\2\0X\3\5-\2\0\0009\2\3\2\18\4\1\0D\2\2\0X\2\46\2\0\0009\2\1\0029\2\4\2D\2\1\0K\0\1\0\0\1\19compe#complete\15term_codes\15pumvisible\afn\bvim\2\3\1\0\a\0\22\0%6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0005\3\4\0=\3\5\2B\0\2\0016\0\0\0'\2\6\0B\0\2\0023\1\a\0006\2\b\0003\3\n\0=\3\t\0029\2\v\0'\4\f\0'\5\r\0'\6\14\0B\2\4\0019\2\v\0'\4\f\0'\5\15\0'\6\16\0B\2\4\0019\2\v\0'\4\17\0'\5\18\0'\6\19\0B\2\4\0019\2\v\0'\4\f\0'\5\20\0'\6\21\0B\2\4\0012\0\0K\0\1\0\25compe#close('')\n\26compe:#confirm('\6x%v:lua.complete('', '')\f%v:lua.complete('', '')\n\ais\tmapx\0\rcomplete\a_G\0\14dln.utils\vsource\1\0\3\rnvim_lua\2\vbuffer\2\rnvim_lsp\2\1\0\1\15min_length\3\0\nsetup\ncompe\frequire\0" }, + loaded = true, + path = "/home/dln/.local/share/nvim/site/pack/packer/start/nvim-compe" + }, + ["nvim-lspconfig"] = { + config = { "\27LJ\2\n\4\0\0\6\0\20\0+6\0\0\0'\2\1\0B\0\2\0016\0\0\0'\2\2\0B\0\2\0029\0\3\0\18\1\0\0'\3\4\0'\4\5\0'\5\6\0B\1\4\1\18\1\0\0'\3\a\0'\4\b\0'\5\t\0B\1\4\1\18\1\0\0'\3\4\0'\4\n\0'\5\v\0B\1\4\1\18\1\0\0'\3\4\0'\4\f\0'\5\r\0B\1\4\1\18\1\0\0'\3\4\0'\4\14\0'\5\15\0B\1\4\1\18\1\0\0'\3\4\0'\4\16\0'\5\17\0B\1\4\1\18\1\0\0'\3\4\0'\4\18\0'\5\19\0B\1\4\1K\0\1\0*lua vim.lsp.buf.formatting()\agf/lua vim.lsp.buf.document_symbol()\ag0*lua vim.lsp.buf.references()\agr/lua vim.lsp.buf.type_definition()\b1gd*lua vim.lsp.buf.definition()\agd.lua vim.lsp.buf.signature_help()\n\6i%lua vim.lsp.buf.hover()\6K\6n\bmap\14dln.utils\19dln.lsp-config\frequire\0" }, + loaded = true, + path = "/home/dln/.local/share/nvim/site/pack/packer/start/nvim-lspconfig" + }, + ["nvim-shelman-theme"] = { + config = { "\27LJ\2\nP\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0'\2\3\0B\0\2\1K\0\1\0\18shelman-light\16colorscheme\15colorbuddy\frequire\0" }, + loaded = true, + path = "/home/dln/.local/share/nvim/site/pack/packer/start/nvim-shelman-theme" + }, + ["nvim-treesitter"] = { + config = { "\27LJ\2\n\1\0\0\3\0\b\0\f6\0\0\0'\2\1\0B\0\2\0016\0\2\0009\0\3\0'\1\5\0=\1\4\0006\0\2\0009\0\3\0'\1\a\0=\1\6\0K\0\1\0\31nvim_treesitter#foldexpr()\rfoldexpr\texpr\15foldmethod\awo\bvim\19dln.treesitter\frequire\0" }, + loaded = true, + path = "/home/dln/.local/share/nvim/site/pack/packer/start/nvim-treesitter" + }, + ["nvim-treesitter-textobjects"] = { + loaded = true, + path = "/home/dln/.local/share/nvim/site/pack/packer/start/nvim-treesitter-textobjects" + }, + ["nvim-ts-autotag"] = { + loaded = true, + path = "/home/dln/.local/share/nvim/site/pack/packer/start/nvim-ts-autotag" + }, + ["packer.nvim"] = { + loaded = true, + path = "/home/dln/.local/share/nvim/site/pack/packer/start/packer.nvim" + }, + ["plenary.nvim"] = { + loaded = true, + path = "/home/dln/.local/share/nvim/site/pack/packer/start/plenary.nvim" + }, + ["popup.nvim"] = { + loaded = true, + path = "/home/dln/.local/share/nvim/site/pack/packer/start/popup.nvim" + }, + ["telescope-fzy-native.nvim"] = { + loaded = true, + path = "/home/dln/.local/share/nvim/site/pack/packer/start/telescope-fzy-native.nvim" + }, + ["telescope-github.nvim"] = { + loaded = true, + path = "/home/dln/.local/share/nvim/site/pack/packer/start/telescope-github.nvim" + }, + ["telescope.nvim"] = { + config = { "\27LJ\2\n\4\0\0\6\0\16\0&6\0\0\0'\2\1\0B\0\2\0016\0\0\0'\2\2\0B\0\2\0029\0\3\0\18\1\0\0'\3\4\0'\4\5\0'\5\6\0B\1\4\1\18\1\0\0'\3\4\0'\4\a\0'\5\6\0B\1\4\1\18\1\0\0'\3\4\0'\4\b\0'\5\t\0B\1\4\1\18\1\0\0'\3\4\0'\4\n\0'\5\v\0B\1\4\1\18\1\0\0'\3\4\0'\4\f\0'\5\r\0B\1\4\1\18\1\0\0'\3\4\0'\4\14\0'\5\15\0B\1\4\1K\0\1\0;lua require(\"telescope.builtin\").treesitter()\14tElua require(\"telescope.builtin\").lsp_document_symbols()\14s:lua require(\"telescope.builtin\").git_files()\14e9lua require(\"telescope.builtin\").oldfiles()\14f\14b8lua require(\"telescope.builtin\").buffers()\f\6n\bmap\14dln.utils\18dln.telescope\frequire\0" }, + loaded = true, + path = "/home/dln/.local/share/nvim/site/pack/packer/start/telescope.nvim" + } +} + +-- Config for: telescope.nvim +try_loadstring("\27LJ\2\n\4\0\0\6\0\16\0&6\0\0\0'\2\1\0B\0\2\0016\0\0\0'\2\2\0B\0\2\0029\0\3\0\18\1\0\0'\3\4\0'\4\5\0'\5\6\0B\1\4\1\18\1\0\0'\3\4\0'\4\a\0'\5\6\0B\1\4\1\18\1\0\0'\3\4\0'\4\b\0'\5\t\0B\1\4\1\18\1\0\0'\3\4\0'\4\n\0'\5\v\0B\1\4\1\18\1\0\0'\3\4\0'\4\f\0'\5\r\0B\1\4\1\18\1\0\0'\3\4\0'\4\14\0'\5\15\0B\1\4\1K\0\1\0;lua require(\"telescope.builtin\").treesitter()\14tElua require(\"telescope.builtin\").lsp_document_symbols()\14s:lua require(\"telescope.builtin\").git_files()\14e9lua require(\"telescope.builtin\").oldfiles()\14f\14b8lua require(\"telescope.builtin\").buffers()\f\6n\bmap\14dln.utils\18dln.telescope\frequire\0", "config", "telescope.nvim") +-- Config for: indent-blankline.nvim +try_loadstring("\27LJ\2\n\4\0\0\2\0\16\0!6\0\0\0009\0\1\0'\1\3\0=\1\2\0006\0\0\0009\0\1\0'\1\5\0=\1\4\0006\0\0\0009\0\1\0005\1\a\0=\1\6\0006\0\0\0009\0\1\0005\1\t\0=\1\b\0006\0\0\0009\0\1\0005\1\v\0=\1\n\0006\0\0\0009\0\1\0+\1\2\0=\1\f\0006\0\0\0009\0\1\0+\1\2\0=\1\r\0006\0\0\0009\0\1\0005\1\15\0=\1\14\0K\0\1\0\1\5\0\0\fIndent1\fIndent2\fIndent3\fIndent4)indent_blankline_char_highlight_list4indent_blankline_show_trailing_blankline_indent-indent_blankline_show_first_indent_level\1\3\0\0\ttext\rmarkdown&indent_blankline_filetype_exclude\1\3\0\0\thelp\rterminal%indent_blankline_buftype_exclude\1\2\0\0\16IndentSpace/indent_blankline_space_char_highlight_list\b⬝ indent_blankline_space_char\b│\26indent_blankline_char\6g\bvim\0", "config", "indent-blankline.nvim") +-- Config for: kommentary +try_loadstring("\27LJ\2\n\1\0\0\6\0\v\0\0226\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\3\0009\0\4\0009\0\5\0'\2\6\0'\3\a\0'\4\b\0004\5\0\0B\0\5\0016\0\3\0009\0\4\0009\0\5\0'\2\t\0'\3\a\0'\4\n\0004\5\0\0B\0\5\1K\0\1\0$kommentary_visual_default\6v\"kommentary_line_default\6\31\6n\20nvim_set_keymap\bapi\bvim\26use_extended_mappings\22kommentary.config\frequire\0", "config", "kommentary") +-- Config for: nvim-treesitter +try_loadstring("\27LJ\2\n\1\0\0\3\0\b\0\f6\0\0\0'\2\1\0B\0\2\0016\0\2\0009\0\3\0'\1\5\0=\1\4\0006\0\2\0009\0\3\0'\1\a\0=\1\6\0K\0\1\0\31nvim_treesitter#foldexpr()\rfoldexpr\texpr\15foldmethod\awo\bvim\19dln.treesitter\frequire\0", "config", "nvim-treesitter") +-- Config for: nvim-shelman-theme +try_loadstring("\27LJ\2\nP\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0'\2\3\0B\0\2\1K\0\1\0\18shelman-light\16colorscheme\15colorbuddy\frequire\0", "config", "nvim-shelman-theme") +-- Config for: nvim-compe +try_loadstring("\27LJ\2\n}\0\1\6\0\a\0\22)\1\0\0\2\0\1\0X\1\176\1\0\0009\1\1\0019\1\2\1'\3\3\0B\1\2\2\18\3\1\0009\1\4\1\18\4\0\0\18\5\0\0B\1\4\2\18\3\1\0009\1\5\1'\4\6\0B\1\3\2X\2\3+\1\1\0X\2\1+\1\2\0L\1\2\0\a%s\nmatch\bsub\6.\fgetline\afn\bvimn\1\0\5\0\5\1\0223\0\0\0006\1\1\0009\1\2\0019\1\3\1'\3\4\0B\1\2\2\23\1\0\1\18\2\0\0\18\4\1\0B\2\2\2\15\0\2\0X\3\a\18\2\0\0\23\4\0\1B\2\2\2\15\0\2\0X\3\2+\2\2\0X\3\1+\2\1\0002\0\0L\2\2\0\6.\bcol\afn\bvim\0\2\1\0\2\5\2\5\1\0256\2\0\0009\2\1\0029\2\2\2B\2\1\2\t\2\0\0X\2\5-\2\0\0009\2\3\2\18\4\0\0D\2\2\0X\2\r-\2\1\0B\2\1\2\15\0\2\0X\3\5-\2\0\0009\2\3\2\18\4\1\0D\2\2\0X\2\46\2\0\0009\2\1\0029\2\4\2D\2\1\0K\0\1\0\0\1\19compe#complete\15term_codes\15pumvisible\afn\bvim\2\3\1\0\a\0\22\0%6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0005\3\4\0=\3\5\2B\0\2\0016\0\0\0'\2\6\0B\0\2\0023\1\a\0006\2\b\0003\3\n\0=\3\t\0029\2\v\0'\4\f\0'\5\r\0'\6\14\0B\2\4\0019\2\v\0'\4\f\0'\5\15\0'\6\16\0B\2\4\0019\2\v\0'\4\17\0'\5\18\0'\6\19\0B\2\4\0019\2\v\0'\4\f\0'\5\20\0'\6\21\0B\2\4\0012\0\0K\0\1\0\25compe#close('')\n\26compe:#confirm('\6x%v:lua.complete('', '')\f%v:lua.complete('', '')\n\ais\tmapx\0\rcomplete\a_G\0\14dln.utils\vsource\1\0\3\rnvim_lua\2\vbuffer\2\rnvim_lsp\2\1\0\1\15min_length\3\0\nsetup\ncompe\frequire\0", "config", "nvim-compe") +-- Config for: lspsaga.nvim +try_loadstring("\27LJ\2\n\4\0\0\b\0\22\00096\0\0\0'\2\1\0B\0\2\0016\0\0\0'\2\2\0B\0\2\0029\0\3\0005\1\4\0\18\2\0\0'\4\5\0'\5\6\0'\6\a\0\18\a\1\0B\2\5\1\18\2\0\0'\4\5\0'\5\b\0'\6\t\0\18\a\1\0B\2\5\1\18\2\0\0'\4\5\0'\5\n\0'\6\v\0\18\a\1\0B\2\5\1\18\2\0\0'\4\5\0'\5\f\0'\6\r\0\18\a\1\0B\2\5\1\18\2\0\0'\4\5\0'\5\14\0'\6\15\0\18\a\1\0B\2\5\1\18\2\0\0'\4\5\0'\5\16\0'\6\17\0\18\a\1\0B\2\5\1\18\2\0\0'\4\5\0'\5\18\0'\6\19\0\18\a\1\0B\2\5\1\18\2\0\0'\4\5\0'\5\20\0'\6\21\0\18\a\1\0B\2\5\1K\0\1\0&:Lspsaga diagnostic_jump_next\a]d&:Lspsaga diagnostic_jump_prev\a[d':Lspsaga show_line_diagnostics\15cd$:Lspsaga preview_definition\agd\24:Lspsaga rename\agr :Lspsaga signature_help\ags\29:Lspsaga code_action\15ca\28:Lspsaga lsp_finder\agh\6n\1\0\1\vsilent\2\bmap\14dln.utils\16dln.lspsaga\frequire\0", "config", "lspsaga.nvim") +-- Config for: nvim-lspconfig +try_loadstring("\27LJ\2\n\4\0\0\6\0\20\0+6\0\0\0'\2\1\0B\0\2\0016\0\0\0'\2\2\0B\0\2\0029\0\3\0\18\1\0\0'\3\4\0'\4\5\0'\5\6\0B\1\4\1\18\1\0\0'\3\a\0'\4\b\0'\5\t\0B\1\4\1\18\1\0\0'\3\4\0'\4\n\0'\5\v\0B\1\4\1\18\1\0\0'\3\4\0'\4\f\0'\5\r\0B\1\4\1\18\1\0\0'\3\4\0'\4\14\0'\5\15\0B\1\4\1\18\1\0\0'\3\4\0'\4\16\0'\5\17\0B\1\4\1\18\1\0\0'\3\4\0'\4\18\0'\5\19\0B\1\4\1K\0\1\0*lua vim.lsp.buf.formatting()\agf/lua vim.lsp.buf.document_symbol()\ag0*lua vim.lsp.buf.references()\agr/lua vim.lsp.buf.type_definition()\b1gd*lua vim.lsp.buf.definition()\agd.lua vim.lsp.buf.signature_help()\n\6i%lua vim.lsp.buf.hover()\6K\6n\bmap\14dln.utils\19dln.lsp-config\frequire\0", "config", "nvim-lspconfig") +END + +catch + echohl ErrorMsg + echom "Error in packer_compiled: " .. v:exception + echom "Please check your config for correctness" + echohl None +endtry