9 files changed,
65 insertions(+),
72 deletions(-)
M
config/nvim/lua/config.lua
··· 24 24 }} 25 25 26 26 -- GitSigns 27 -require'plug.gitsigns' 27 +require'gitsigns'.setup { 28 + signs = { 29 + add = {hl = 'GitSignsAdd', text = '│'}; 30 + change = {hl = 'GitSignsChange', text = '│'}; 31 + delete = {hl = 'GitSignsDelete', text = '_'}; 32 + topdelete = {hl = 'GitSignsDelete', text = '‾'}; 33 + changedelete = {hl = 'GitSignsChange', text = '~'}; 34 + }; 35 + watch_index = {interval = 1000}; 36 + current_line_blame = true, 37 + sign_priority = 6, 38 + update_debounce = 100, 39 + status_formatter = nil, 40 + use_decoration_api = true, 41 + use_internal_diff = true, 42 +} 28 43 29 44 -- NeoGit 30 45 require'neogit'.setup {} 31 46 32 47 -- NvimTree 33 -require'plug.nvimtree' 48 +vim.g.nvim_tree_side = "right" 49 +vim.g.nvim_tree_ignore = {".git", ".cache", "node_modules", "__pycache__", "venv", "env"} 50 +vim.g.nvim_tree_auto_close = 0 51 +vim.g.nvim_tree_quit_on_open = 0 52 +vim.g.nvim_tree_width = 24 34 53 35 54 -- TreeSitter 36 55 require'nvim-treesitter.configs'.setup { ··· 39 58 } 40 59 41 60 -- Colorizer 42 --- require'plug.colorizer' 61 +require'colorizer'.setup({'*';}, { 62 + mode = 'background'; 63 + RGB = true; 64 + RRGGBB = true; 65 + RRGGBBAA = false; 66 + rgb_fn = true; 67 + hsl_fn = false; 68 + css = false; 69 + css_fn = true; 70 + names = false; 71 +})
M
config/nvim/lua/efm.lua
··· 1 1 -- Python 2 -local black = { 3 - formatCommand = "black ${filename}", formatStdin = true 4 -} 5 2 local flake8 = { 6 3 lintCommand = "flake8 --ignore=E501 --stdin-display-name ${INPUT} -", 7 4 lintStdin = true, ··· 9 6 } 10 7 11 8 -- Javascript 12 -local prettier = { 13 - formatCommand = "prettier --stdin-filepath ${INPUT}", formatStdin = true 14 -} 15 9 local eslint = { 16 10 lintCommand = "./node_modules/.bin/eslint -f unix --stdin --stdin-filename ${INPUT}", 17 11 lintIgnoreExitCode = true, ··· 31 25 32 26 -- Setup 33 27 require"lspconfig".efm.setup { 34 - init_options = {documentFormatting = true, codeAction = false}, 28 + init_options = {documentFormatting = false, codeAction = false}, 35 29 filetypes = {"python", "javascript", "typescript", "go"}, 36 30 settings = { 37 31 rootMarkers = {".git/"}, 38 32 languages = { 39 - python = {flake8, black}, 40 - javascript = {eslint, prettier}, 41 - typescript = {eslint, prettier}, 33 + python = {flake8}, 34 + javascript = {eslint}, 35 + typescript = {eslint}, 42 36 go = {golint} 43 - } 44 - } 37 + }; 38 + }; 45 39 }
D
config/nvim/lua/plug/gitsigns.lua
··· 1 -require'gitsigns'.setup { 2 - signs = { 3 - add = {hl = 'GitSignsAdd', text = '│'}; 4 - change = {hl = 'GitSignsChange', text = '│'}; 5 - delete = {hl = 'GitSignsDelete', text = '_'}; 6 - topdelete = {hl = 'GitSignsDelete', text = '‾'}; 7 - changedelete = {hl = 'GitSignsChange', text = '~'}; 8 - }; 9 - watch_index = { 10 - interval = 1000 11 - }; 12 - current_line_blame = true, 13 - sign_priority = 6, 14 - update_debounce = 100, 15 - status_formatter = nil, 16 - use_decoration_api = true, 17 - use_internal_diff = true, 18 -}
M
config/nvim/lua/tsserver.lua
··· 1 1 require('lspconfig').typescript.setup({ 2 - handlers = { 3 - ["textDocument/publishDiagnostics"] = function(_, _, params, client_id, _, config) 4 - if params.diagnostics ~= nil then 5 - local idx = 1 6 - while idx <= #params.diagnostics do 7 - if params.diagnostics[idx].code == 80001 then 8 - table.remove(params.diagnostics, idx) 9 - else 10 - idx = idx + 1 11 - end 12 - end 13 - end 14 - vim.lsp.diagnostic.on_publish_diagnostics(_, _, params, client_id, _, config) 15 - end, 16 - }, 2 + handlers = { 3 + ["textDocument/publishDiagnostics"] = function(_, _, params, client_id, _, config) 4 + if params.diagnostics ~= nil then 5 + local idx = 1 6 + while idx <= #params.diagnostics do 7 + if params.diagnostics[idx].code == 80001 then 8 + table.remove(params.diagnostics, idx) 9 + else 10 + idx = idx + 1 11 + end 12 + end 13 + end 14 + vim.lsp.diagnostics.on_publish_diagnostics(_, _, params, client_id, _, config) 15 + end, 16 + }, 17 17 })
M
vscode/settings.json
··· 1 1 { 2 2 "update.showReleaseNotes": false, 3 3 "window.menuBarVisibility": "hidden", 4 - "workbench.iconTheme": "vs-seti", 4 + "workbench.iconTheme": "material-icon-theme", 5 5 6 6 "workbench.sideBar.location": "right", 7 7 "workbench.editor.untitled.hint": "hidden", ··· 14 14 // "editor.cursorSmoothCaretAnimation": true, 15 15 "editor.fontFamily": "'Jetbrains Mono', monospace", 16 16 "editor.hover.enabled": false, 17 - // "editor.lightbulb.enabled": false, 17 + // "editor.lightbulb.enabled""cSpell.userWords": ["postgres"]: false, 18 18 "editor.minimap.enabled": false, 19 19 "editor.smoothScrolling": true, 20 20 "editor.mouseWheelZoom": true, ··· 35 35 "git.confirmSync": false, 36 36 "git.enableSmartCommit": true, 37 37 38 + "cSpell.userWords": ["postgres"], 38 39 "extensions.ignoreRecommendations": true, 39 40 "docker.showStartPage": false, 40 41 "prettier.semi": false, ··· 51 52 "[javascript]": { 52 53 "editor.defaultFormatter": "esbenp.prettier-vscode", 53 54 "editor.tabSize": 2 54 - } 55 + }, 56 + "editor.suggestSelection": "first", 57 + "cSpell.enabled": false 55 58 }