Compare commits

...

3 Commits

11 changed files with 164 additions and 144 deletions

23
.bashrc
View File

@ -49,17 +49,10 @@ HISTFILESIZE=$HISTSIZE
HISTCONTROL=ignorespace:ignoredups
shopt -s histappend
if command -v nvim > /dev/null; then
success "setting EDITOR to nvim"
export EDITOR=nvim
success "setting MANPAGER viewer to nvim"
export MANPAGER="nvim +Man!"
else
warn "nvim not found"
fi
# OS specific environment
#
# This should be executed before the tools section, especially if we are using
# tools from Homebrew
case "$OSTYPE" in
darwin*)
# Homebrew
@ -84,6 +77,16 @@ esac
# Tools
if command -v nvim > /dev/null; then
success "setting EDITOR to nvim"
export EDITOR=nvim
success "setting MANPAGER viewer to nvim"
export MANPAGER="nvim +Man!"
else
warn "nvim not found"
fi
# fzf
if command -v fzf > /dev/null; then
eval "$(fzf "--$(basename "$SHELL")")"

View File

@ -17,27 +17,45 @@ return {
table.insert(file_paths, item.value)
end
require("telescope.pickers").new({}, {
require("telescope.pickers")
.new({}, {
prompt_title = "Harpoon",
finder = require("telescope.finders").new_table({
results = file_paths,
}),
previewer = conf.file_previewer({}),
sorter = conf.generic_sorter({}),
}):find()
})
:find()
end
vim.keymap.set("n", "<leader>a", function() harpoon:list():add() end)
vim.keymap.set("n", "<leader>a", function()
harpoon:list():add()
end)
-- vim.keymap.set("n", "<C-e>", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
vim.keymap.set("n", "<C-e>", function() toggle_telescope(harpoon:list()) end, { desc = "Open harpoon window" })
vim.keymap.set("n", "<C-e>", function()
toggle_telescope(harpoon:list())
end, { desc = "Open harpoon window" })
vim.keymap.set("n", "<C-h>", function() harpoon:list():select(1) end)
vim.keymap.set("n", "<C-t>", function() harpoon:list():select(2) end)
vim.keymap.set("n", "<C-n>", function() harpoon:list():select(3) end)
vim.keymap.set("n", "<C-s>", function() harpoon:list():select(4) end)
vim.keymap.set("n", "<C-h>", function()
harpoon:list():select(1)
end)
vim.keymap.set("n", "<C-t>", function()
harpoon:list():select(2)
end)
vim.keymap.set("n", "<C-n>", function()
harpoon:list():select(3)
end)
vim.keymap.set("n", "<C-s>", function()
harpoon:list():select(4)
end)
-- Toggle previous & next buffers stored within Harpoon list
vim.keymap.set("n", "<C-S-P>", function() harpoon:list():prev() end)
vim.keymap.set("n", "<C-S-N>", function() harpoon:list():next() end)
vim.keymap.set("n", "<C-S-P>", function()
harpoon:list():prev()
end)
vim.keymap.set("n", "<C-S-N>", function()
harpoon:list():next()
end)
end,
}

View File

@ -1,6 +1,5 @@
return {
"lukas-reineke/indent-blankline.nvim",
main = "ibl",
opts = {
},
opts = {},
}

View File

@ -35,7 +35,7 @@ return {
init_options = {
formatter = "standard",
linters = { "standard" },
}
},
})
-- lspconfig.standardrb.setup({})
lspconfig.bashls.setup({})

View File

@ -2,5 +2,5 @@ return {
"nvim-tree/nvim-tree.lua",
config = function()
require("nvim-tree").setup()
end
end,
}

View File

@ -5,6 +5,6 @@ vim.cmd("set shiftwidth=4")
vim.cmd("set smartindent")
vim.wo.number = true
vim.cmd.colorscheme "tokyonight"
vim.cmd.colorscheme("tokyonight")
vim.opt.termguicolors = true

View File

@ -1,7 +1,7 @@
[user]
name = Ryan Cavicchioni
email = ryan@cavi.cc
signingkey = /home/ryan/.ssh/id_ed25519.pub
signingkey = ~/.ssh/id_ed25519.pub
[color]
ui = true
[push]
@ -17,7 +17,7 @@
[log]
showSignature = true
[gpg "ssh"]
allowedSignersFile = /home/ryan/.ssh/allowed_signers
allowedSignersFile = ~/.ssh/allowed_signers
[diff]
tool = meld
[difftool]