Compare commits

..

5 Commits

17 changed files with 168 additions and 179 deletions

23
.bashrc
View File

@ -49,17 +49,10 @@ HISTFILESIZE=$HISTSIZE
HISTCONTROL=ignorespace:ignoredups HISTCONTROL=ignorespace:ignoredups
shopt -s histappend 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 # OS specific environment
#
# This should be executed before the tools section, especially if we are using
# tools from Homebrew
case "$OSTYPE" in case "$OSTYPE" in
darwin*) darwin*)
# Homebrew # Homebrew
@ -84,6 +77,16 @@ esac
# Tools # 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 # fzf
if command -v fzf > /dev/null; then if command -v fzf > /dev/null; then
eval "$(fzf "--$(basename "$SHELL")")" eval "$(fzf "--$(basename "$SHELL")")"

View File

@ -1 +0,0 @@
newtext = green

View File

@ -17,27 +17,45 @@ return {
table.insert(file_paths, item.value) table.insert(file_paths, item.value)
end end
require("telescope.pickers").new({}, { require("telescope.pickers")
.new({}, {
prompt_title = "Harpoon", prompt_title = "Harpoon",
finder = require("telescope.finders").new_table({ finder = require("telescope.finders").new_table({
results = file_paths, results = file_paths,
}), }),
previewer = conf.file_previewer({}), previewer = conf.file_previewer({}),
sorter = conf.generic_sorter({}), sorter = conf.generic_sorter({}),
}):find() })
:find()
end 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() 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-h>", function()
vim.keymap.set("n", "<C-t>", function() harpoon:list():select(2) end) harpoon:list():select(1)
vim.keymap.set("n", "<C-n>", function() harpoon:list():select(3) end) end)
vim.keymap.set("n", "<C-s>", function() harpoon:list():select(4) 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 -- 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-P>", function()
vim.keymap.set("n", "<C-S-N>", function() harpoon:list():next() end) harpoon:list():prev()
end)
vim.keymap.set("n", "<C-S-N>", function()
harpoon:list():next()
end)
end, end,
} }

View File

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

View File

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

View File

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

View File

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

View File

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

3
.gitignore vendored
View File

@ -1,3 +0,0 @@
!.vim/bundle/Vundle.vim
.vim/bundle/*
.vim/swp/*

0
.gitmodules vendored
View File

3
.hgrc
View File

@ -1,3 +0,0 @@
[ui]
username = Ryan Cavicchioni <ryan@confabulator.net>
editor = vim

4
.ssh/allowed_signers Normal file
View File

@ -0,0 +1,4 @@
ryan@cavi.cc namespaces="git" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGznaofIstAxYsX1MH8xQiZU4aOO4SUw9OlRbyFMfQTx compy386
ryan@cavi.cc namespaces="git" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICndorpp/6aKlLq2K1YP81r8zA80VGp1qAUeCZtdVhAw lappy486
rcavicchioni@gmail.com namespaces="git" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGznaofIstAxYsX1MH8xQiZU4aOO4SUw9OlRbyFMfQTx compy386
rcavicchioni@gmail.com namespaces="git" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICndorpp/6aKlLq2K1YP81r8zA80VGp1qAUeCZtdVhAw lappy486

View File

@ -1,28 +0,0 @@
install: install-vim install-git install-bash install-colordiff install-hg \
install-mutt
install-vim:
rm -rf ~/.vim ~/.vimrc
ln -s `pwd`/.vim ~/.vim
ln -s ~/.vim/vimrc ~/.vimrc
install-git:
rm -f ~/.gitconfig
ln -s `pwd`/.gitconfig ~/.gitconfig
install-bash:
rm -f ~/.bash_profile ~/.inputrc
ln -s `pwd`/.bash_profile ~/.bash_profile
ln -s `pwd`/.inputrc ~/.inputrc
install-colordiff:
rm -f ~/.colordiffrc
ln -s `pwd`/.colordiffrc ~/.colordiffrc
install-hg:
rm -f ~/.hgrc
ln -s `pwd`/.hgrc ~/.hgrc
install-mutt:
rm -f ~/.muttrc
ln -s `pwd`/.muttrc ~/.muttrc