rob
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: rob:3f8f0fe495bccec3c1199cd2db9a3c4bc6e57c6a
Branches Tags
rob:main
rob:master
..
compare: rob:231f2e79e42be022b0318e984f2ffb345ebf1af5
Branches Tags
rob:main
rob:master

No commits in common. "3f8f0fe495bccec3c1199cd2db9a3c4bc6e57c6a" and "231f2e79e42be022b0318e984f2ffb345ebf1af5" have entirely different histories.
3f8f0fe495 ... 231f2e79e4

3 changed files with 8 additions and 11 deletions
Show Stats Expand all files Collapse all files

2
gitconfig
View File

@ -23,8 +23,6 @@
cltms = !sh -c 'cd $HOME/dev && git clone $1 && cd $(basename $1 .git) && tmuxsess' -- cltms = !sh -c 'cd $HOME/dev && git clone $1 && cd $(basename $1 .git) && tmuxsess' --
co = checkout co = checkout
cols = !git checkout $(git branch | fzf) cols = !git checkout $(git branch | fzf)
comb = !git checkout $(git mainbranch)
cost = checkout staging
cp = cherry-pick cp = cherry-pick
cp2 = "!fn() { git cherry-pick $1~2..$1; }; fn" cp2 = "!fn() { git cherry-pick $1~2..$1; }; fn"
cp3 = "!fn() { git cherry-pick $1~3..$1; }; fn" cp3 = "!fn() { git cherry-pick $1~3..$1; }; fn"

3
vim/lua/lsp_config.lua
View File

@ -9,7 +9,6 @@ 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", "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.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>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>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>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) vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>i", "<Cmd>lua vim.lsp.buf.implementation()<CR>", opts)
@ -128,7 +127,7 @@ nvim_lsp.solargraph.setup({
-- Typescript -- Typescript
-- https://jose-elias-alvarez.medium.com/configuring-neovims-lsp-client-for-typescript-development-5789d58ea9c -- https://jose-elias-alvarez.medium.com/configuring-neovims-lsp-client-for-typescript-development-5789d58ea9c
nvim_lsp.ts_ls.setup({ nvim_lsp.tsserver.setup({
on_attach = on_attach, on_attach = on_attach,
}) })

14
zshrc
View File

@ -159,6 +159,13 @@ export KEYTIMEOUT=2
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
# set PATHs (highest priority last) # 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 [ "$(uname -s)" = "Darwin" ]; then
if [ -d /opt/homebrew/bin ]; then if [ -d /opt/homebrew/bin ]; then
export PATH=/opt/homebrew/bin:$PATH export PATH=/opt/homebrew/bin:$PATH
@ -169,13 +176,6 @@ if [ "$(uname -s)" = "Darwin" ]; then
export PATH="/Applications/Postgres.app/Contents/Versions/16/bin:$PATH" export PATH="/Applications/Postgres.app/Contents/Versions/16/bin:$PATH"
fi 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" export VIMPLUGIN="$HOME/.vim/pack/git-plugins"
# source local zshrc, if it exists (not: not in git) # source local zshrc, if it exists (not: not in git)