diff --git a/config/bash/.bashrc b/config/bash/.bashrc index 7047c93..05f1851 100644 --- a/config/bash/.bashrc +++ b/config/bash/.bashrc @@ -55,6 +55,8 @@ alias pathls='printf "%b\n" "${PATH//:/\\n}"' # (git - vim - tmux) alias g="git" alias groot="cd $(git rev-parse --show-toplevel 2> /dev/null || echo -n ".")" +alias v="$EDITOR" +alias nv="nvim" alias tmls="tmux ls" alias tmlsc="tmux lsc" alias tmks="tmux kill-session -t" # kill one session diff --git a/config/git/.gitconfig b/config/git/.gitconfig index c002d04..e4eb21d 100644 --- a/config/git/.gitconfig +++ b/config/git/.gitconfig @@ -42,8 +42,14 @@ pul = pull ps = push puhs = push - sm = submodule + sm = submodule [credential "https://dev.azure.com"] useHttpPath = true [credential] helper = store +# https://cli.github.com/manual/gh_auth_setup-git +# gh auth setup-git +[credential "https://github.com"] + helper = !/usr/bin/gh auth git-credential +[credential "https://gist.github.com"] + helper = !/usr/bin/gh auth git-credential diff --git a/config/nvim/.config/nvim/lazy-lock.json b/config/nvim/.config/nvim/lazy-lock.json index 6cff0c1..41a89f0 100644 --- a/config/nvim/.config/nvim/lazy-lock.json +++ b/config/nvim/.config/nvim/lazy-lock.json @@ -4,25 +4,27 @@ "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "emmet-vim": { "branch": "master", "commit": "6c511a8d7d2863066f32e25543e2bb99d505172c" }, "fidget.nvim": { "branch": "main", "commit": "9238947645ce17d96f30842e61ba81147185b657" }, - "fzf": { "branch": "master", "commit": "97030d4cb10d9b1c51f2afd60e14c6e46a7fe4ba" }, + "fzf": { "branch": "master", "commit": "d57e1f8baae3680901b48eb4b421de4a7aa95cfc" }, "fzf.vim": { "branch": "master", "commit": "556f45e79ae5e3970054fee4c4373472604a1b4e" }, "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "2daa8921b7afdcfa47419a21ea343c3df6d74fa0" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "c6c686781f9841d855bf1b926e10aa5e19430a38" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "neovim": { "branch": "main", "commit": "91548dca53b36dbb9d36c10f114385f759731be1" }, - "neovim-ayu": { "branch": "master", "commit": "37160699469d695486174fb863aae2f2a4c1f90f" }, + "neovim-ayu": { "branch": "master", "commit": "283badaa983234c90e857c12c1f1c18e1544360a" }, "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, - "nvim-lspconfig": { "branch": "master", "commit": "c580f34bc5fdca8aaf737a9ab8a5d775cb940e57" }, - "nvim-treesitter": { "branch": "master", "commit": "b4897f5a8453e7efeafb21ff5b2bbdc2e3faf1bd" }, + "nvim-lspconfig": { "branch": "master", "commit": "88dff6268a068403c87b461aee69beb61ceb8303" }, + "nvim-treesitter": { "branch": "master", "commit": "6cb4098d51479f644f967c17d4482bab1ba2640f" }, "oil.nvim": { "branch": "master", "commit": "ba858b662599eab8ef1cba9ab745afded99cb180" }, "tokyonight.nvim": { "branch": "main", "commit": "45d22cf0e1b93476d3b6d362d720412b3d34465c" }, "vim-commentary": { "branch": "master", "commit": "64a654ef4a20db1727938338310209b6a63f60c9" }, - "vim-eunuch": { "branch": "master", "commit": "c61533c9868ce78bb7fcbe06b308d7fa7f19e447" }, - "vim-fugitive": { "branch": "master", "commit": "fcb4db52e7f65b95705aa58f0f2df1312c1f2df2" }, + "vim-eunuch": { "branch": "master", "commit": "e86bb794a1c10a2edac130feb0ea590a00d03f1e" }, + "vim-fugitive": { "branch": "master", "commit": "174230d6a7f2df94705a7ffd8d5413e27ec10a80" }, "vim-hybrid": { "branch": "master", "commit": "cc58baabeabc7b83768e25b852bf89c34756bf90" }, - "vim-nightfly-colors": { "branch": "master", "commit": "f1176605eb01b38d84e0e9e221c9599bd022dfd4" }, + "vim-nightfly-colors": { "branch": "master", "commit": "3fe724c616f5285bafbc762dd1e9830ae1815a1e" }, "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }, "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, "vim-rsi": { "branch": "master", "commit": "45540637ead22f011e8215f1c90142e49d946a54" }, diff --git a/config/nvim/.config/nvim/lua/config/keymaps.lua b/config/nvim/.config/nvim/lua/config/keymaps.lua index fc32532..0c82a64 100644 --- a/config/nvim/.config/nvim/lua/config/keymaps.lua +++ b/config/nvim/.config/nvim/lua/config/keymaps.lua @@ -17,7 +17,19 @@ vim.keymap.set('n', 'dt', ':r !date') vim.keymap.set('n', 'rc', ':vsplit $MYVIMRC') vim.keymap.set('n', 'so', ':source $MYVIMRC') vim.keymap.set('n', 'rcc', ':vsplit ~/.config/nvim/lua/config/') -vim.keymap.set('n', 'rcp', ':vsplit ~/.config/nvim/lua/plugin-config/') +vim.keymap.set('n', 'rck', ':tabnew ~/.config/nvim/lua/config/keymaps.lua') + +vim.keymap.set('n', 'rcp', function() + vim.cmd(':tabnew ~/.config/nvim/lua/config/lazy.lua') + vim.cmd(':vsplit ~/.config/nvim/lua/plugin-config/init.lua') + vim.cmd(':split ~/.config/nvim/lua/plugin-config/') +end) + +vim.keymap.set('n', 'rcl', function() + vim.cmd(':tabnew ~/.config/nvim/lua/plugin-config/lsp.lua') + vim.cmd(':vsplit ~/.config/nvim/lua/plugin-config/cmp.lua') + vim.cmd(':vsplit ~/.config/nvim/lua/plugin-config/nvim-treesitter.lua') +end) -- windows vim.keymap.set('n', 'cl', ':close') @@ -25,3 +37,7 @@ vim.keymap.set('n', 'cl', ':close') -- formatting tools vim.keymap.set('n', '=j', ':%!python -m json.tool') +-- plugins +vim.keymap.set('n', 'pu', ':Lazy update') +vim.keymap.set('n', 'ps', ':Lazy sync') +vim.keymap.set('n', 'pi', ':Lazy install') diff --git a/config/nvim/.config/nvim/lua/config/lazy.lua b/config/nvim/.config/nvim/lua/config/lazy.lua index 93b6202..f59cc5b 100644 --- a/config/nvim/.config/nvim/lua/config/lazy.lua +++ b/config/nvim/.config/nvim/lua/config/lazy.lua @@ -6,7 +6,7 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then if vim.v.shell_error ~= 0 then vim.api.nvim_echo({ { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, - { out, "WarningMsg" }, + { out, "WarningMsg" }, { "\nPress any key to exit..." }, }, true, {}) vim.fn.getchar() @@ -38,24 +38,39 @@ require("lazy").setup({ 'lewis6991/gitsigns.nvim', -- fzf - 'junegunn/fzf', run = ":call fzf#install()", + { + 'junegunn/fzf', + run = ':call fzf#install()', + }, 'junegunn/fzf.vim', -- filetree 'stevearc/oil.nvim', + -- md preview + { + "iamcco/markdown-preview.nvim", + cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, + build = "cd app && npm install", + init = function() + vim.g.mkdp_filetypes = { "markdown" } + end, + ft = { "markdown" }, + }, + -- lsp - "williamboman/mason.nvim", - "williamboman/mason-lspconfig.nvim", - "neovim/nvim-lspconfig", + 'williamboman/mason.nvim', + 'williamboman/mason-lspconfig.nvim', + 'neovim/nvim-lspconfig', 'hrsh7th/cmp-nvim-lsp', 'hrsh7th/cmp-buffer', 'hrsh7th/cmp-path', 'hrsh7th/cmp-cmdline', - "L3MON4D3/LuaSnip", + 'L3MON4D3/LuaSnip', 'hrsh7th/nvim-cmp', + 'mattn/emmet-vim', 'nvim-treesitter/nvim-treesitter', - "j-hui/fidget.nvim", + 'j-hui/fidget.nvim', -- colorschemes 'rose-pine/neovim', diff --git a/config/nvim/.config/nvim/lua/plugin-config/lsp.lua b/config/nvim/.config/nvim/lua/plugin-config/lsp.lua index 245dbc5..16807a6 100644 --- a/config/nvim/.config/nvim/lua/plugin-config/lsp.lua +++ b/config/nvim/.config/nvim/lua/plugin-config/lsp.lua @@ -39,7 +39,17 @@ end -- mason - package manager for lsp servers require('mason').setup() -local servers = { 'clangd', 'rust_analyzer', 'pylsp', 'ts_ls', 'lua_ls', 'gopls', 'bashls' } +local servers = { + 'clangd', + 'rust_analyzer', + 'gopls', + 'pylsp', + 'ts_ls', + 'eslint', + 'html', + 'lua_ls', + 'bashls' +} require('mason-lspconfig').setup({ ensure_installed = servers }) -- nvim-cmp - extend capabilities diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index 94fc31b..1c893d9 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -79,7 +79,6 @@ alias pathls='printf "%b\n" "${PATH//:/\\n}"' alias g="git" alias groot="cd $(git rev-parse --show-toplevel 2>/dev/null || echo -n ".")" alias v="$EDITOR" -alias vi="$EDITOR" alias nv="nvim" alias tmls="tmux ls" alias tmlsc="tmux lsc"