update zsh, vscode, lvim

This commit is contained in:
neoteny 2021-10-23 11:34:53 +03:00
parent 846f37457c
commit 2feea5ce1e
5 changed files with 27 additions and 9 deletions

View file

@ -1,3 +1,5 @@
vim.o.relativenumber = true
lvim.format_on_save = true lvim.format_on_save = true
lvim.lint_on_save = true lvim.lint_on_save = true
lvim.colorscheme = "onedarker" lvim.colorscheme = "onedarker"
@ -23,7 +25,7 @@ lvim.builtin.telescope.defaults.file_ignore_patterns = { ".git", "node_modules",
lvim.builtin.nvimtree.ignore = { ".git", "node_modules", ".bin", "env" } lvim.builtin.nvimtree.ignore = { ".git", "node_modules", ".bin", "env" }
-- LSP -- LSP
-- lvim.lsp.override = {"gopls"} lvim.lsp.override = { "go", "gopls" }
-- Others -- Others
require "user.plugins" require "user.plugins"

View file

@ -1,10 +1,10 @@
lvim.keys.insert_mode["<C-BS>"] = "<C-w>"
lvim.keys.normal_mode["<C-w>"] = "<cmd>BufferClose<cr>" lvim.keys.normal_mode["<C-w>"] = "<cmd>BufferClose<cr>"
lvim.keys.normal_mode["<C-s>"] = "<cmd>w<cr>" lvim.keys.normal_mode["<C-s>"] = "<cmd>w<cr>"
lvim.keys.term_mode["jk"] = "<C-\\><C-n>" lvim.keys.term_mode["jk"] = "<C-\\><C-n>"
lvim.keys.visual_mode["jk"] = "<esc>" lvim.keys.visual_mode["jk"] = "<esc>"
-- Which key -- Which key
-- lvim.builtin.which_key.mappings.l.a = { "<cmd>Telescope lsp_code_actions<cr>", "Code Actions" }
lvim.builtin.which_key.mappings.l.d = { "<cmd>TroubleToggle<cr>", "Diagnostics" } lvim.builtin.which_key.mappings.l.d = { "<cmd>TroubleToggle<cr>", "Diagnostics" }
lvim.builtin.which_key.mappings.l.R = { "<cmd>TroubleToggle lsp_references<cr>", "References" } lvim.builtin.which_key.mappings.l.R = { "<cmd>TroubleToggle lsp_references<cr>", "References" }
lvim.builtin.which_key.mappings.s.P = { "<cmd>Telescope projects<cr>", "Projects" } lvim.builtin.which_key.mappings.s.P = { "<cmd>Telescope projects<cr>", "Projects" }

View file

@ -3,10 +3,18 @@ lvim.plugins = {
{ "folke/trouble.nvim", cmd = "TroubleToggle" }, { "folke/trouble.nvim", cmd = "TroubleToggle" },
{ {
"theHamsta/nvim-dap-virtual-text", "theHamsta/nvim-dap-virtual-text",
after = "nvim-dap",
config = function() config = function()
require("plug.dap").setup() require("plug.dap").setup()
end, end,
}, },
{
"kristijanhusak/orgmode.nvim",
ft = "org",
config = function()
require"orgmode".setup {}
end,
},
{ {
"folke/todo-comments.nvim", "folke/todo-comments.nvim",
event = "BufRead", event = "BufRead",
@ -33,7 +41,7 @@ lvim.plugins = {
"Smirnov-O/ts-unit.nvim", "Smirnov-O/ts-unit.nvim",
keys = { "vip", "cip", "yip", "dip" }, keys = { "vip", "cip", "yip", "dip" },
config = function() config = function()
require("plug.ts-unit").setup() require("plug.ts-unit").setup { keymaps = true }
end, end,
}, },
{ {

View file

@ -1,6 +1,6 @@
{ {
"workbench.iconTheme": "material-icon-theme", "workbench.iconTheme": "material-icon-theme",
"workbench.colorTheme": "GitHub Dark Default", "workbench.colorTheme": "Visual Studio Dark",
"workbench.sideBar.location": "left", "workbench.sideBar.location": "left",
"workbench.editor.untitled.hint": "hidden", "workbench.editor.untitled.hint": "hidden",
"workbench.startupEditor": "none", "workbench.startupEditor": "none",
@ -24,7 +24,7 @@
"editor.fontSize": 14, "editor.fontSize": 14,
"editor.tabSize": 4, "editor.tabSize": 4,
// Files // Files
"explorer.compactFolders": true, "explorer.compactFolders": false,
"explorer.confirmDragAndDrop": false, "explorer.confirmDragAndDrop": false,
"explorer.confirmDelete": false, "explorer.confirmDelete": false,
"files.insertFinalNewline": false, "files.insertFinalNewline": false,
@ -53,15 +53,23 @@
"test" "test"
], ],
"calva.paredit.defaultKeyMap": "strict", "calva.paredit.defaultKeyMap": "strict",
// Golang
"go.toolsManagement.autoUpdate": true,
"go.lintOnSave": "package",
"go.lintTool": "golint",
"go.formatTool": "gofumpt",
// Languages // Languages
"javascript.suggestionActions.enabled": false, "javascript.suggestionActions.enabled": false,
"typescript.suggestionActions.enabled": false, "typescript.suggestionActions.enabled": false,
"[javascript]": { "[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode", // "editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.tabSize": 2 "editor.tabSize": 2
}, },
"[typescript]": { "[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode" // "editor.defaultFormatter": "esbenp.prettier-vscode"
}, },
"go.toolsManagement.autoUpdate": true "typescript.inlayHints.parameterNames.enabled": "literals",
"typescript.inlayHints.variableTypes.enabled": true,
"javascript.inlayHints.functionLikeReturnTypes.enabled": true,
"window.zoomLevel": 1,
} }

2
zshrc
View file

@ -28,7 +28,7 @@ dotnet() {
## Aliases ## Aliases
alias cls="clear" cp="cp -r" mkdir="mkdir -p" open="open_command" lg="lazygit" alias cls="clear" cp="cp -r" mkdir="mkdir -p" open="open_command" lg="lazygit"
alias lv="lvim" vim="lvim" alias v="nvim" vim="v"
alias ...="cd ../.." .3="cd ../../.." alias ...="cd ../.." .3="cd ../../.."
alias gor="go run" gob="go build" gog="go get" goi="go install" got="go test" alias gor="go run" gob="go build" gog="go get" goi="go install" got="go test"
alias n="npm" asdfi=". /opt/asdf-vm/asdf.sh" alias n="npm" asdfi=". /opt/asdf-vm/asdf.sh"