Compare commits
7 Commits
b0692ec0fd
...
master
Author | SHA1 | Date | |
---|---|---|---|
99e5c0b13e
|
|||
16c2a7fa30
|
|||
99001c45f5
|
|||
ac1fb7c56b
|
|||
5a1e041ce0
|
|||
f18932a13a
|
|||
007db7e0ce
|
107
.bashrc
Normal file
107
.bashrc
Normal file
@ -0,0 +1,107 @@
|
|||||||
|
# Source global definitions
|
||||||
|
if [ -f /etc/bashrc ]; then
|
||||||
|
. /etc/bashrc
|
||||||
|
fi
|
||||||
|
|
||||||
|
function log() {
|
||||||
|
if [[ -v "$VERBOSE" ]]; then
|
||||||
|
echo "$1"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
function success() {
|
||||||
|
log "✅ ${1}"
|
||||||
|
}
|
||||||
|
|
||||||
|
function warn() {
|
||||||
|
log "⚠️ ${1}"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Run systemd generators
|
||||||
|
if [[ -f /usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator ]]; then
|
||||||
|
set -o allexport
|
||||||
|
# shellcheck disable=1090
|
||||||
|
source <(/usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator)
|
||||||
|
set +o allexport
|
||||||
|
fi
|
||||||
|
|
||||||
|
# User specific environment
|
||||||
|
if ! [[ "$PATH" =~ $HOME/.local/bin:$HOME/bin: ]]; then
|
||||||
|
PATH="$HOME/.local/bin:$HOME/bin:$PATH"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# User specific aliases and functions
|
||||||
|
if [ -d ~/.bashrc.d ]; then
|
||||||
|
for rc in ~/.bashrc.d/*; do
|
||||||
|
if [ -f "$rc" ]; then
|
||||||
|
# shellcheck disable=1090
|
||||||
|
. "$rc"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
unset rc
|
||||||
|
|
||||||
|
# Environment variables
|
||||||
|
|
||||||
|
# history control
|
||||||
|
HISTSIZE=10000
|
||||||
|
HISTFILESIZE=$HISTSIZE
|
||||||
|
HISTCONTROL=ignorespace:ignoredups
|
||||||
|
shopt -s histappend
|
||||||
|
|
||||||
|
# OS specific environment
|
||||||
|
#
|
||||||
|
# This should be executed before the tools section, especially if we are using
|
||||||
|
# tools from Homebrew
|
||||||
|
case "$OSTYPE" in
|
||||||
|
darwin*)
|
||||||
|
# Homebrew
|
||||||
|
if [[ -f /opt/homebrew/bin/brew ]]; then
|
||||||
|
eval "$(/opt/homebrew/bin/brew shellenv)"
|
||||||
|
success "set up homebrew"
|
||||||
|
else
|
||||||
|
warn "homebrew not found"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Ruby
|
||||||
|
if [[ -d /opt/homebrew/opt/ruby ]]; then
|
||||||
|
export PATH="/opt/homebrew/opt/ruby/bin:$PATH"
|
||||||
|
export LDFLAGS="-L/opt/homebrew/opt/ruby/lib"
|
||||||
|
export CPPFLAGS="-I/opt/homebrew/opt/ruby/include"
|
||||||
|
success "set up homebrew ruby"
|
||||||
|
else
|
||||||
|
warn "homebrew ruby not found"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
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")")"
|
||||||
|
success "set up fzf"
|
||||||
|
else
|
||||||
|
warn "fzf not found"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# starship
|
||||||
|
if command -v starship > /dev/null; then
|
||||||
|
eval "$(starship init "$(basename "$SHELL")")"
|
||||||
|
success "set up starship"
|
||||||
|
else
|
||||||
|
warn "starship not found"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Aliases
|
||||||
|
alias nview="nvim -R"
|
@ -1 +0,0 @@
|
|||||||
newtext = green
|
|
@ -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,
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
return {
|
return {
|
||||||
"lukas-reineke/indent-blankline.nvim",
|
"lukas-reineke/indent-blankline.nvim",
|
||||||
main = "ibl",
|
main = "ibl",
|
||||||
opts = {
|
opts = {},
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
@ -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({})
|
||||||
|
@ -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,
|
||||||
}
|
}
|
||||||
|
@ -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
|
||||||
|
@ -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
3
.gitignore
vendored
@ -1,3 +0,0 @@
|
|||||||
!.vim/bundle/Vundle.vim
|
|
||||||
.vim/bundle/*
|
|
||||||
.vim/swp/*
|
|
0
.gitmodules
vendored
0
.gitmodules
vendored
3
.hgrc
3
.hgrc
@ -1,3 +0,0 @@
|
|||||||
[ui]
|
|
||||||
username = Ryan Cavicchioni <ryan@confabulator.net>
|
|
||||||
editor = vim
|
|
1
.profile
1
.profile
@ -2,6 +2,7 @@
|
|||||||
if [ -n "$BASH_VERSION" ]; then
|
if [ -n "$BASH_VERSION" ]; then
|
||||||
# include .bashrc if it exists
|
# include .bashrc if it exists
|
||||||
if [ -f "$HOME/.bashrc" ]; then
|
if [ -f "$HOME/.bashrc" ]; then
|
||||||
|
# shellcheck disable=SC1090
|
||||||
. "$HOME/.bashrc"
|
. "$HOME/.bashrc"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
4
.ssh/allowed_signers
Normal file
4
.ssh/allowed_signers
Normal 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
|
28
Makefile
28
Makefile
@ -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
|
|
Reference in New Issue
Block a user