Compare commits

..

3 Commits

Author SHA1 Message Date
Ben Harris 4815662c48 reindent gitconfig 2022-08-10 15:11:27 -04:00
Ben Harris fd399e7dfa update vim submodules 2022-08-10 15:06:33 -04:00
Ben Harris ab9da2a8b4 tidy up config.fish 2022-08-10 15:05:22 -04:00
5 changed files with 198 additions and 41 deletions

View File

@ -5,21 +5,38 @@ if test -d ~/Maildir
set -x MAIL ~/Maildir
end
for i in ~/bin ~/.yarn/bin ~/.rbenv/bin ~/.local/bin ~/.cargo/bin
if test -d $i && not contains $i $PATH
set -x fish_user_paths $fish_user_paths $i
for i in ~/bin ~/.local/bin ~/.rbenv/bin ~/.rbenv/shims ~/.cargo/bin ~/.yarn/bin
if test -d $i
fish_add_path --path $i
end
end
# add rbenv paths
status --is-interactive && type -q rbenv && source (rbenv init -|psub)
if status --is-interactive && type -q rbenv
set -gx RBENV_SHELL fish
source '/usr/lib/rbenv/completions/rbenv.fish'
command rbenv rehash 2>/dev/null
function rbenv
set command $argv[1]
set -e argv[1]
switch "$command"
case rehash shell
source (rbenv "sh-$command" $argv|psub)
case '*'
command rbenv "$command" $argv
end
end
end
#set -x SSH_AGENT_PID ""
if test -S $HOME/.gnupg/S.gpg-agent
set -x SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent
set -x GPG_SOCK $HOME/.gnupg/S.gpg-agent
else
set -x SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket)
type -q gpgconf && set -x SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket)
end
set -x BBJ_USER $USER

View File

@ -6,7 +6,7 @@ SETUVAR EMAIL:ben\x40tilde\x2eteam
SETUVAR __fish_init_2_39_8:\x1d
SETUVAR __fish_init_2_3_0:\x1d
SETUVAR __fish_init_3_x:\x1d
SETUVAR __fish_initialized:3100
SETUVAR __fish_initialized:3400
SETUVAR fish_color_autosuggestion:555\x1ebrblack
SETUVAR fish_color_cancel:\x2dr
SETUVAR fish_color_command:\x2d\x2dbold

View File

@ -34,17 +34,18 @@
smtpencryption = tls
smtpserver = mail.tilde.team
smtpserverport = 587
annotate = yes
smtpuser = ben
annotate = yes
[alias]
lol = log --oneline --graph --decorate --all
joke = !curl -s https://raw.githubusercontent.com/EugeneKay/git-jokes/lulz/Jokes.txt | shuf -n1
dad = !curl https://icanhazdadjoke.com
staged = diff --staged
ap = add --patch
cv = commit --verbose
local = log --oneline --no-merges ${1-$(git branch -lvv | perl -ne '/^\\\\*.*\\\\[(.*?)\\\\]/ and print \"$1\\n\"')}..HEAD
upstream = log --oneline --no-merges HEAD..${1-$(git branch -lvv | perl -ne '/^\\\\*.*\\\\[(.*?)\\\\]/ and print \"$1\\n\"')}
cv = commit --verbose
[rerere]
enabled = true
[merge]
@ -52,12 +53,16 @@
conflictstyle = diff3
[mergetool]
prompt = false
[core]
pager = diff-highlight | less
excludesfile = /home/ben/.gitignore
[url "git@salsa.debian.org:"]
pushInsteadOf = https://salsa.debian.org/
insteadOf = salsa:
[url "git@bhh.sh:repos/"]
pushInsteadOf = https://git.bhh.sh/
[init]
defaultBranch = main

@ -1 +1 @@
Subproject commit ebb89a0846ff8b8bc64579155d661b825f97d3f2
Subproject commit 61042e35024a133bb5af42850d3852d20ebcc4e1

View File

@ -198,7 +198,7 @@ tilde.local_hostname
tilde.usermode
tilde.command = "/msg idlerpg_bot login wowbagger ${sec.data.idlerpgpass}"
tilde.command_delay = 25
tilde.autojoin = "#.tilde,#adventofcode,#allhandsactive,#anelki,#ascii.town,#aussie,#binary-counting,#bots,#club,#cosmic,#counting,#covid19,#ctrl-c,#dotnet,#earthward,#espanol,#fr,#gemini,#gopher,#helpdesk,#idlerpg,#linux,#logarion,#math,#meta,#midgard,#minecraft,#netnews,#nsfw,#opers,#rw.rs,#secret-sudoers,#selfhosting,#southlondon,#team,#thunix,#tilde.zone-admin,#tildebot,#tildenet,#tilderadio,#tilderadio-djs,#tildetel,#topm,#town,#vim,#wiki,#xinu,#ZfA,#tilde.green,#tildeverse"
tilde.autojoin = "#.tilde,#adventofcode,#allhandsactive,#anelki,#ascii.town,#aussie,#binary-counting,#bots,#club,#cosmic,#counting,#covid19,#ctrl-c,#dotnet,#earthward,#espanol,#fr,#gemini,#gopher,#helpdesk,#idlerpg,#linux,#logarion,#math,#meta,#midgard,#minecraft,#netnews,#nsfw,#opers,#rw.rs,#secret-sudoers,#selfhosting,#southlondon,#team,#thunix,#tilde.zone-admin,#tildebot,#tildenet,#tilderadio,#tilderadio-djs,#tildetel,#topm,#town,#vim,#wiki,#xinu,#ZfA,#tilde.green,#tildeverse,#nl"
tilde.autojoin_dynamic
tilde.autorejoin
tilde.autorejoin_delay
@ -798,3 +798,138 @@ pisslocal.notify
pisslocal.split_msg_max_length
pisslocal.charset_message
pisslocal.default_chantypes
snoonet.addresses = "irc.snoonet.org/6697"
snoonet.proxy
snoonet.ipv6
snoonet.ssl = on
snoonet.ssl_cert
snoonet.ssl_password
snoonet.ssl_priorities
snoonet.ssl_dhkey_size
snoonet.ssl_fingerprint
snoonet.ssl_verify
snoonet.password
snoonet.capabilities
snoonet.sasl_mechanism
snoonet.sasl_username = "benharri"
snoonet.sasl_password = "${sec.data.snoonetpass}"
snoonet.sasl_key
snoonet.sasl_timeout
snoonet.sasl_fail
snoonet.autoconnect
snoonet.autoreconnect
snoonet.autoreconnect_delay
snoonet.nicks
snoonet.nicks_alternate
snoonet.username
snoonet.realname
snoonet.local_hostname
snoonet.usermode
snoonet.command
snoonet.command_delay
snoonet.autojoin = "#help,#personalfinance,#snoonet"
snoonet.autojoin_dynamic
snoonet.autorejoin
snoonet.autorejoin_delay
snoonet.connection_timeout
snoonet.anti_flood_prio_high
snoonet.anti_flood_prio_low
snoonet.away_check
snoonet.away_check_max_nicks
snoonet.msg_kick
snoonet.msg_part
snoonet.msg_quit
snoonet.notify
snoonet.split_msg_max_length
snoonet.charset_message
snoonet.default_chantypes
liberta.casa.addresses = "irc.liberta.casa/6697"
liberta.casa.proxy
liberta.casa.ipv6
liberta.casa.ssl = on
liberta.casa.ssl_cert
liberta.casa.ssl_password
liberta.casa.ssl_priorities
liberta.casa.ssl_dhkey_size
liberta.casa.ssl_fingerprint
liberta.casa.ssl_verify
liberta.casa.password
liberta.casa.capabilities
liberta.casa.sasl_mechanism
liberta.casa.sasl_username = "ben"
liberta.casa.sasl_password = "${sec.data.libertacasapass}"
liberta.casa.sasl_key
liberta.casa.sasl_timeout
liberta.casa.sasl_fail
liberta.casa.autoconnect
liberta.casa.autoreconnect
liberta.casa.autoreconnect_delay
liberta.casa.nicks
liberta.casa.nicks_alternate
liberta.casa.username
liberta.casa.realname
liberta.casa.local_hostname
liberta.casa.usermode
liberta.casa.command
liberta.casa.command_delay
liberta.casa.autojoin = "#libcasa.info,#mods"
liberta.casa.autojoin_dynamic
liberta.casa.autorejoin
liberta.casa.autorejoin_delay
liberta.casa.connection_timeout
liberta.casa.anti_flood_prio_high
liberta.casa.anti_flood_prio_low
liberta.casa.away_check
liberta.casa.away_check_max_nicks
liberta.casa.msg_kick
liberta.casa.msg_part
liberta.casa.msg_quit
liberta.casa.notify
liberta.casa.split_msg_max_length
liberta.casa.charset_message
liberta.casa.default_chantypes
m455.addresses = "m455.casa/6697"
m455.proxy
m455.ipv6
m455.ssl = on
m455.ssl_cert
m455.ssl_password
m455.ssl_priorities
m455.ssl_dhkey_size
m455.ssl_fingerprint
m455.ssl_verify
m455.password
m455.capabilities
m455.sasl_mechanism = external
m455.sasl_username = "ben"
m455.sasl_password
m455.sasl_key
m455.sasl_timeout
m455.sasl_fail
m455.autoconnect
m455.autoreconnect
m455.autoreconnect_delay
m455.nicks
m455.nicks_alternate
m455.username
m455.realname
m455.local_hostname
m455.usermode
m455.command
m455.command_delay
m455.autojoin = "#basement,#serverroom,#siliconpals,#tildebot"
m455.autojoin_dynamic
m455.autorejoin
m455.autorejoin_delay
m455.connection_timeout
m455.anti_flood_prio_high
m455.anti_flood_prio_low
m455.away_check
m455.away_check_max_nicks
m455.msg_kick
m455.msg_part
m455.msg_quit
m455.notify
m455.split_msg_max_length
m455.charset_message
m455.default_chantypes