Compare commits
4 Commits
231f2e79e4
...
3f8f0fe495
Author | SHA1 | Date |
---|---|---|
Rob Watson | 3f8f0fe495 | |
Rob Watson | 2dd6cd4221 | |
Rob Watson | e9005dff17 | |
Rob Watson | 453c272acf |
|
@ -23,6 +23,8 @@
|
|||
cltms = !sh -c 'cd $HOME/dev && git clone $1 && cd $(basename $1 .git) && tmuxsess' --
|
||||
co = checkout
|
||||
cols = !git checkout $(git branch | fzf)
|
||||
comb = !git checkout $(git mainbranch)
|
||||
cost = checkout staging
|
||||
cp = cherry-pick
|
||||
cp2 = "!fn() { git cherry-pick $1~2..$1; }; fn"
|
||||
cp3 = "!fn() { git cherry-pick $1~3..$1; }; fn"
|
||||
|
|
|
@ -9,6 +9,7 @@ local on_attach = function(client, bufnr)
|
|||
vim.api.nvim_buf_set_keymap(bufnr, "n", "gD", "<Cmd>lua vim.lsp.buf.type_definition()<CR>", opts)
|
||||
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>gd", "<Cmd>lua vim.lsp.buf.definition()<CR>", opts)
|
||||
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>gD", "<Cmd>lua vim.lsp.buf.type_definition()<CR>", opts)
|
||||
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>k", "<Cmd>lua vim.diagnostic.open_float()<CR>", opts)
|
||||
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>e", "<Cmd>lua vim.lsp.buf.rename()<CR>", opts)
|
||||
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>r", "<Cmd>lua vim.lsp.buf.references()<CR>", opts)
|
||||
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>i", "<Cmd>lua vim.lsp.buf.implementation()<CR>", opts)
|
||||
|
@ -127,7 +128,7 @@ nvim_lsp.solargraph.setup({
|
|||
-- Typescript
|
||||
-- https://jose-elias-alvarez.medium.com/configuring-neovims-lsp-client-for-typescript-development-5789d58ea9c
|
||||
|
||||
nvim_lsp.tsserver.setup({
|
||||
nvim_lsp.ts_ls.setup({
|
||||
on_attach = on_attach,
|
||||
})
|
||||
|
||||
|
|
14
zshrc
14
zshrc
|
@ -159,13 +159,6 @@ export KEYTIMEOUT=2
|
|||
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
|
||||
|
||||
# set PATHs (highest priority last)
|
||||
export PATH=$HOME/go/bin:$PATH
|
||||
export PATH=$HOME/local/sbin:$PATH
|
||||
export PATH=$HOME/local/bin:$PATH
|
||||
export PATH=$HOME/bin:$PATH
|
||||
export PATH=$HOME/.local/bin:$PATH
|
||||
export PATH=$HOME/script:$PATH
|
||||
|
||||
if [ "$(uname -s)" = "Darwin" ]; then
|
||||
if [ -d /opt/homebrew/bin ]; then
|
||||
export PATH=/opt/homebrew/bin:$PATH
|
||||
|
@ -176,6 +169,13 @@ if [ "$(uname -s)" = "Darwin" ]; then
|
|||
export PATH="/Applications/Postgres.app/Contents/Versions/16/bin:$PATH"
|
||||
fi
|
||||
|
||||
export PATH=$HOME/go/bin:$PATH
|
||||
export PATH=$HOME/local/sbin:$PATH
|
||||
export PATH=$HOME/local/bin:$PATH
|
||||
export PATH=$HOME/bin:$PATH
|
||||
export PATH=$HOME/.local/bin:$PATH
|
||||
export PATH=$HOME/script:$PATH
|
||||
|
||||
export VIMPLUGIN="$HOME/.vim/pack/git-plugins"
|
||||
|
||||
# source local zshrc, if it exists (not: not in git)
|
||||
|
|
Loading…
Reference in New Issue