Compare commits

...

18 Commits

Author SHA1 Message Date
99e5c0b13e fix crap lua formatting 2025-05-23 20:02:23 -05:00
16c2a7fa30 .bashrc: set up Homebrew before the tools section 2025-05-15 10:03:13 -05:00
99001c45f5 use relative path in .gitconfig 2025-05-15 09:54:57 -05:00
ac1fb7c56b add .ssh/allowed_signers 2025-05-15 09:52:19 -05:00
5a1e041ce0 remove unused files 2025-05-15 09:51:07 -05:00
f18932a13a bash: add macOS environment variables 2025-05-14 16:58:28 -05:00
007db7e0ce organzie .profile and .bashrc 2025-05-14 15:58:01 -05:00
7bd940d717 remove unused sections of .profile 2025-05-14 11:45:48 -05:00
17766d4035 get rid of defunct .bash_profile 2025-05-14 11:41:57 -05:00
c2cf5c3662 nvim: retab! 2025-05-14 11:28:07 -05:00
4f03e7a041 nvim: install bashls 2025-05-14 11:16:54 -05:00
366dda66de nvim: lazy-lock.json 2025-05-14 00:09:52 -05:00
6cba030e25 nvim: add more language servers 2025-05-14 00:08:56 -05:00
5420660696 nvim: enable more linters 2025-05-14 00:08:42 -05:00
41b29f360b update .gitconfig
https://blog.gitbutler.com/how-git-core-devs-configure-git/
2025-05-13 14:47:56 -05:00
65c05e3def nvim: add diffview 2025-05-13 14:46:55 -05:00
c95f1347b1 Enable golangci-lint 2024-11-06 14:46:00 -06:00
e3c8d39137 Add Neogit 2024-10-29 21:36:16 -05:00
23 changed files with 306 additions and 260 deletions

View File

@ -1,49 +0,0 @@
# ~/.profile: executed by the command interpreter for login shells.
# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
# exists.
# see /usr/share/doc/bash/examples/startup-files for examples.
# the files are located in the bash-doc package.
# the default umask is set in /etc/profile; for setting the umask
# for ssh logins, install and configure the libpam-umask package.
#umask 022
# if running bash
if [ -n "$BASH_VERSION" ]; then
# include .bashrc if it exists
if [ -f "$HOME/.bashrc" ]; then
. "$HOME/.bashrc"
fi
fi
# set PATH so it includes user's private bin if it exists
if [ -d "$HOME/bin" ] ; then
PATH="$HOME/bin:$PATH"
fi
PATH=/usr/local/bin:$PATH
if [ -e `which keychain` ]; then
# load SSH key
keychain --timeout 240 ~/.ssh/id_rsa
source ~/.keychain/$HOSTNAME-sh
fi
# some aliases
alias vi='vim'
alias ta='tmux attach'
alias ta2='tmux -2 attach'
alias ns='netstat -tulpn'
alias llh='ls -lh'
alias ll='ls -lp'
alias ls='ls -p'
# set 1337 h4x0r looking shell prompt
#PS1="\w > "
PS1='\[\e[1;32m\][\u@\h \w]\$\[\e[0m\] '
[[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator
export EDITOR=vim
source /usr/local/share/chruby/chruby.sh

107
.bashrc Normal file
View 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"

View File

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

View File

@ -1,43 +1,47 @@
{ {
"LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" }, "LuaSnip": { "branch": "master", "commit": "c1851d5c519611dfc451b6582961b2602e0af89b" },
"catppuccin": { "branch": "main", "commit": "7be452ee067978cdc8b2c5f3411f0c71ffa612b9" }, "catppuccin": { "branch": "main", "commit": "1bf070129c0b6f77cc23f6a2212dcdc868308c52" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"conform.nvim": { "branch": "master", "commit": "40d4e98fcc3e6f485f0e8924c63734bc7e305967" }, "conform.nvim": { "branch": "master", "commit": "2b2b30260203af3b93a7470ac6c8457ddd6e32d9" },
"everforest-nvim": { "branch": "main", "commit": "7c57941d5ef5a150f307b9295c00a59e95d78587" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, "everforest-nvim": { "branch": "main", "commit": "2eb7c348f880ba93de4d98cae049c9441f5d4d49" },
"gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
"gruvbox.nvim": { "branch": "main", "commit": "49d9c0b150ba70efcd831ec7b3cb8ee740067045" }, "fzf-lua": { "branch": "main", "commit": "5af306b30f699513669efdf51cf50a6deab53968" },
"harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" }, "gitsigns.nvim": { "branch": "main", "commit": "43b0c856ae5f32a195d83f4a27fe21d63e6c966c" },
"indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" }, "gruvbox.nvim": { "branch": "main", "commit": "00e38a379bab3389e187b3953566d67d494dfddd" },
"kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" }, "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
"lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
"lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "kanagawa.nvim": { "branch": "master", "commit": "4de88d695634a8776c687af8e7436cfa074aa0c0" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" },
"lush.nvim": { "branch": "main", "commit": "45a79ec4acb5af783a6a29673a999ce37f00497e" }, "lush.nvim": { "branch": "main", "commit": "45a79ec4acb5af783a6a29673a999ce37f00497e" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "d39a75bbce4b8aad5d627191ea915179c77c100f" },
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mason.nvim": { "branch": "main", "commit": "7c7318e8bae7e3536ef6b9e86b9e38e74f2e125e" },
"mini.icons": { "branch": "main", "commit": "a2742459f0ee32806c2438ca06b4d8b331f3f4d4" }, "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, "mini.pick": { "branch": "main", "commit": "fa1e449e1080bf7aa9b2890ee186d23b1b4e1287" },
"nightfox.nvim": { "branch": "main", "commit": "7557f26defd093c4e9bc17f28b08403f706f5a44" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" },
"neogit": { "branch": "master", "commit": "00b102e0332f6b27f0aed17ab05732cc53089f08" },
"nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" },
"nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" }, "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" },
"nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
"nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
"nvim-lint": { "branch": "master", "commit": "f707b3ae50417067fa63fdfe179b0bff6b380da1" }, "nvim-lint": { "branch": "master", "commit": "fdb04e9285edefbe25a02a31a35e8fbb10fe054d" },
"nvim-lspconfig": { "branch": "master", "commit": "d141895d1d9f41048fff201d62a2d6e96d299e32" }, "nvim-lspconfig": { "branch": "master", "commit": "5a137448fd921a0c5d3939cb75e60d21f64e4606" },
"nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, "nvim-surround": { "branch": "main", "commit": "0e62500b98f4513feaaf7425c135472457ea5b7d" },
"nvim-tree.lua": { "branch": "master", "commit": "0fede9f813534a0bdbd8a654568367a351123959" }, "nvim-tree.lua": { "branch": "master", "commit": "e7d1b7dadc62fe2eccc17d814354b0a5688621ce" },
"nvim-treesitter": { "branch": "master", "commit": "5a2ff8b7ca5470b1011ed82ef3fdd53139ffc467" }, "nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" },
"nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, "nvim-web-devicons": { "branch": "master", "commit": "f1420728f59843eb2ef084406b3d0201a0a0932d" },
"oil.nvim": { "branch": "master", "commit": "ccab9d5e09e2d0042fbbe5b6bd05e82426247067" }, "oil.nvim": { "branch": "master", "commit": "685cdb4ffa74473d75a1b97451f8654ceeab0f4a" },
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
"rose-pine": { "branch": "main", "commit": "d396005db5bbd1d4ec7772a7c96c96f4c4802328" }, "rose-pine": { "branch": "main", "commit": "491a0c77abc7ecb955c27a974091a5968232995f" },
"telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
"tokyonight.nvim": { "branch": "main", "commit": "2c85fad417170d4572ead7bf9fdd706057bd73d7" }, "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
"trouble.nvim": { "branch": "main", "commit": "254145ffd528b98eb20be894338e2d5c93fa02c2" }, "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
"undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" }, "undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
"vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" }, "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
"zenbones.nvim": { "branch": "main", "commit": "88960c8aa3ad8aff0bcccdce7cd23629c7a3c510" } "zenbones.nvim": { "branch": "main", "commit": "9deaa8a38e43e8c587b427095dd43c3511255b21" }
} }

View File

@ -17,6 +17,7 @@ return {
formatters_by_ft = { formatters_by_ft = {
lua = { "stylua" }, lua = { "stylua" },
ruby = { "rufo" }, ruby = { "rufo" },
go = { "gofmt" },
}, },
}, },
} }

View File

@ -0,0 +1 @@
return { "sindrets/diffview.nvim" }

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

@ -1,13 +1,24 @@
return { return {
"mfussenegger/nvim-lint", "mfussenegger/nvim-lint",
opts = {
linters_by_ft = {
-- ruby = { "rubocop", "standardrb" },
ruby = { "standardrb" },
go = { "golangcilint" },
},
},
config = function() config = function()
require("lint").linters_by_ft = { local lint = require("lint")
ruby = { "rubocop", "standardrb" },
lint.linters_by_ft = {
-- ruby = { "rubocop", "standardrb" },
ruby = { "standardrb" },
go = { "golangcilint" },
} }
vim.api.nvim_create_autocmd({ "BufWritePost" }, { vim.api.nvim_create_autocmd({ "BufWritePost" }, {
callback = function() callback = function()
require("lint").try_lint() lint.try_lint()
end, end,
}) })
end, end,

View File

@ -4,7 +4,7 @@ return {
config = function() config = function()
require("mason").setup() require("mason").setup()
end, end,
}, },
{ {
"williamboman/mason-lspconfig.nvim", "williamboman/mason-lspconfig.nvim",
dependencies = { "williamboman/mason.nvim" }, dependencies = { "williamboman/mason.nvim" },
@ -13,10 +13,13 @@ return {
ensure_installed = { ensure_installed = {
"lua_ls", "lua_ls",
"ruby_lsp", "ruby_lsp",
"standardrb", -- "standardrb",
"terraformls", "terraformls",
"yamlls", "yamlls",
"pyright", "pyright",
"zls",
"gopls",
"bashls",
}, },
}) })
end, end,
@ -27,8 +30,14 @@ return {
config = function() config = function()
local lspconfig = require("lspconfig") local lspconfig = require("lspconfig")
lspconfig.ruby_lsp.setup({}) lspconfig.zls.setup({})
lspconfig.standardrb.setup({}) lspconfig.ruby_lsp.setup({
init_options = {
formatter = "standard",
linters = { "standard" },
},
})
-- lspconfig.standardrb.setup({})
lspconfig.bashls.setup({}) lspconfig.bashls.setup({})
lspconfig.yamlls.setup({}) lspconfig.yamlls.setup({})
lspconfig.terraformls.setup({}) lspconfig.terraformls.setup({})
@ -49,6 +58,8 @@ return {
}, },
}) })
lspconfig.pyright.setup({}) lspconfig.pyright.setup({})
lspconfig.gopls.setup({})
lspconfig.zls.setup({})
end, end,
}, },
} }

View File

@ -0,0 +1,13 @@
return {
"NeogitOrg/neogit",
dependencies = {
"nvim-lua/plenary.nvim", -- required
"sindrets/diffview.nvim", -- optional - Diff integration
-- Only one of these is needed.
"nvim-telescope/telescope.nvim", -- optional
"ibhagwan/fzf-lua", -- optional
"echasnovski/mini.pick", -- optional
},
config = true,
}

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,29 +1,26 @@
[user] [user]
name = Ryan Cavicchioni name = Ryan Cavicchioni
email = ryan@cavi.cc email = ryan@cavi.cc
signingkey = ~/.ssh/id_ed25519.pub
[color] [color]
ui = true ui = true
[push] [push]
default = simple default = simple
[commit] [commit]
gpgsign = true gpgsign = true
[log] [pull]
showsignature = true ff = only
[core] [gpg]
pager = delta format = ssh
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true # use n and N to move between diff sections
# delta detects terminal colors automatically; set one of these to disable auto-detection
# dark = true
# light = true
[merge] [merge]
conflictstyle = diff3 conflictstyle = zdiff3
[log]
showSignature = true
[gpg "ssh"]
allowedSignersFile = ~/.ssh/allowed_signers
[diff] [diff]
colorMoved = default tool = meld
[difftool]
prompt = false
[difftool "meld"]
cmd = meld "$LOCAL" "$REMOTE"

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

View File

@ -1,44 +1,8 @@
# ~/.profile: executed by the command interpreter for login shells.
# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
# exists.
# see /usr/share/doc/bash/examples/startup-files for examples.
# the files are located in the bash-doc package.
# the default umask is set in /etc/profile; for setting the umask
# for ssh logins, install and configure the libpam-umask package.
#umask 022
# if running bash # if running bash
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
# set PATH so it includes user's private bin directories
PATH="$HOME/bin:$HOME/.local/bin:$PATH"
export EDITOR=vim
export GPG_TTY=$(tty)
if [ ! -e /run/systemd/system ]; then
SSH_ENV="${HOME}/.ssh/env"
function start_ssh_agent {
ssh-agent | sed -e '/^echo/d' > "${SSH_ENV}"
chmod 0600 "${SSH_ENV}"
. "${SSH_ENV}"
}
if [ -f "${SSH_ENV}" ]; then
. "${SSH_ENV}"
if ! kill -0 "${SSH_AGENT_PID}" > /dev/null 2>&1; then
start_ssh_agent
fi
else
start_ssh_agent
fi
else
export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
fi

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