diff --git a/config/lvim/config.lua b/config/lvim/config.lua index 3046fe4..3356708 100644 --- a/config/lvim/config.lua +++ b/config/lvim/config.lua @@ -1,3 +1,5 @@ +vim.o.relativenumber = true + lvim.format_on_save = true lvim.lint_on_save = true 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" } -- LSP --- lvim.lsp.override = {"gopls"} +lvim.lsp.override = { "go", "gopls" } -- Others require "user.plugins" diff --git a/config/lvim/lua/user/keymaps.lua b/config/lvim/lua/user/keymaps.lua index fc0be55..026ba6f 100644 --- a/config/lvim/lua/user/keymaps.lua +++ b/config/lvim/lua/user/keymaps.lua @@ -1,10 +1,10 @@ +lvim.keys.insert_mode[""] = "" lvim.keys.normal_mode[""] = "BufferClose" lvim.keys.normal_mode[""] = "w" lvim.keys.term_mode["jk"] = "" lvim.keys.visual_mode["jk"] = "" -- Which key --- lvim.builtin.which_key.mappings.l.a = { "Telescope lsp_code_actions", "Code Actions" } lvim.builtin.which_key.mappings.l.d = { "TroubleToggle", "Diagnostics" } lvim.builtin.which_key.mappings.l.R = { "TroubleToggle lsp_references", "References" } lvim.builtin.which_key.mappings.s.P = { "Telescope projects", "Projects" } diff --git a/config/lvim/lua/user/plugins.lua b/config/lvim/lua/user/plugins.lua index 9687f9c..afd214c 100644 --- a/config/lvim/lua/user/plugins.lua +++ b/config/lvim/lua/user/plugins.lua @@ -3,10 +3,18 @@ lvim.plugins = { { "folke/trouble.nvim", cmd = "TroubleToggle" }, { "theHamsta/nvim-dap-virtual-text", + after = "nvim-dap", config = function() require("plug.dap").setup() end, }, + { + "kristijanhusak/orgmode.nvim", + ft = "org", + config = function() + require"orgmode".setup {} + end, + }, { "folke/todo-comments.nvim", event = "BufRead", @@ -33,7 +41,7 @@ lvim.plugins = { "Smirnov-O/ts-unit.nvim", keys = { "vip", "cip", "yip", "dip" }, config = function() - require("plug.ts-unit").setup() + require("plug.ts-unit").setup { keymaps = true } end, }, { diff --git a/vscode/settings.json b/vscode/settings.json index ea9a793..bdf6acc 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -1,6 +1,6 @@ { "workbench.iconTheme": "material-icon-theme", - "workbench.colorTheme": "GitHub Dark Default", + "workbench.colorTheme": "Visual Studio Dark", "workbench.sideBar.location": "left", "workbench.editor.untitled.hint": "hidden", "workbench.startupEditor": "none", @@ -24,7 +24,7 @@ "editor.fontSize": 14, "editor.tabSize": 4, // Files - "explorer.compactFolders": true, + "explorer.compactFolders": false, "explorer.confirmDragAndDrop": false, "explorer.confirmDelete": false, "files.insertFinalNewline": false, @@ -53,15 +53,23 @@ "test" ], "calva.paredit.defaultKeyMap": "strict", + // Golang + "go.toolsManagement.autoUpdate": true, + "go.lintOnSave": "package", + "go.lintTool": "golint", + "go.formatTool": "gofumpt", // Languages "javascript.suggestionActions.enabled": false, "typescript.suggestionActions.enabled": false, "[javascript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode", + // "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.tabSize": 2 }, "[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, } \ No newline at end of file diff --git a/zshrc b/zshrc index 20a06f5..200734d 100644 --- a/zshrc +++ b/zshrc @@ -28,7 +28,7 @@ dotnet() { ## Aliases 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 gor="go run" gob="go build" gog="go get" goi="go install" got="go test" alias n="npm" asdfi=". /opt/asdf-vm/asdf.sh"