fix autojoins and is_git_dirty

This commit is contained in:
Ben Harris 2018-11-28 11:08:06 -05:00
parent 737e009db3
commit f5bb310554
5 changed files with 19 additions and 7 deletions

View File

@ -1,6 +1,7 @@
status --is-login; and status --is-interactive; and exec byobu-launcher status --is-login; and status --is-interactive; and exec byobu-launcher
set -xg EDITOR nvim set -xg EDITOR nvim
set -xg TZ 'America/Detroit'
set -g theme_nerd_fonts yes set -g theme_nerd_fonts yes
set -g theme_color_scheme dark set -g theme_color_scheme dark
@ -21,7 +22,7 @@ for path in $user_paths
end end
end end
set -x SSH_AGENT_PID "" #set -x SSH_AGENT_PID ""
if test -S $HOME/.gnupg/S.gpg-agent if test -S $HOME/.gnupg/S.gpg-agent
set -x SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent set -x SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent
set -x GPG_SOCK $HOME/.gnupg/S.gpg-agent set -x GPG_SOCK $HOME/.gnupg/S.gpg-agent

View File

@ -1 +1 @@
/home/ben/.config/fisherman/nvm/__nvm_run.fish /home/ben/.config/fisherman/nvm/functions/__nvm_run.fish

View File

@ -1,3 +1,4 @@
function is_git function is_git
git symbolic-ref HEAD > /dev/null ^&1 git rev-parse --verify HEAD >/dev/null ^&1
end end

View File

@ -1,3 +1,13 @@
function is_git_dirty function is_git_dirty
is_git; and git diff --cached --quiet # based on https://github.com/git/git/blob/master/git-sh-setup.sh#L210
is_git; or return 1
if git diff-files --quiet --ignore-submodules
or git diff-index --cached --quiet --ignore-submodules HEAD --
return 1
else
return 0
end
end end

View File

@ -180,7 +180,7 @@ tilde.local_hostname
tilde.usermode tilde.usermode
tilde.command = "/oper root ${sec.data.tildenetoper}; /msg operserv login ${sec.data.pass}" tilde.command = "/oper root ${sec.data.tildenetoper}; /msg operserv login ${sec.data.pass}"
tilde.command_delay tilde.command_delay
tilde.autojoin = "#opers,#secret-sudoers,#meta,#team,#sudoers,#YourTilde,#chaos,#bots,#music,#share,#stevenuniverse,#suwp,#projects,#politics,#dnd,#journal,#shitposting,#quotes,#gopher,#tildeverse,#venting,#idlerpg,#tilderadio,#zaphod,#thunix,#yee,#modded,#minecraft,#minetest,#bbj,#tildelinux,#tildetheater,#slbr,#dadjokes,#sr.ht,#nand.pub,#6502gen,#cosmic,#institute,#.tilde youneedtoknowthepassword,secretsudoteam" tilde.autojoin = "#opers,#secret-sudoers,#meta,#team,#sudoers,#YourTilde,#chaos,#bots,#music,#share,#stevenuniverse,#suwp,#projects,#politics,#dnd,#journal,#shitposting,#quotes,#gopher,#tildeverse,#venting,#idlerpg,#tilderadio,#zaphod,#thunix,#yee,#modded,#minecraft,#minetest,#bbj,#tildelinux,#tildetheater,#slbr,#dadjokes,#sr.ht,#nand.pub,#6502gen,#cosmic,#institute,#.tilde,#irc-court youneedtoknowthepassword,secretsudoteam"
tilde.autorejoin tilde.autorejoin
tilde.autorejoin_delay tilde.autorejoin_delay
tilde.connection_timeout tilde.connection_timeout
@ -426,7 +426,7 @@ oftc.local_hostname
oftc.usermode oftc.usermode
oftc.command oftc.command
oftc.command_delay oftc.command_delay
oftc.autojoin = "#fish,#debian-devel" oftc.autojoin = "#fish,#debian-devel,#debian,#debian-offtopic"
oftc.autorejoin oftc.autorejoin
oftc.autorejoin_delay oftc.autorejoin_delay
oftc.connection_timeout oftc.connection_timeout
@ -467,7 +467,7 @@ freenode.local_hostname
freenode.usermode freenode.usermode
freenode.command freenode.command
freenode.command_delay freenode.command_delay
freenode.autojoin = "#weechat,##oodnet,#alacritty,#disroot,#fediverse,#irc.net,#lobsters,#lobsters-boil,#lxcontainers,#thelounge,#gitea,#mastodon,#pleroma,#pleroma-offtopic,#pixelfed,#pixelfed-offtopic,#oragono,#vim,#weechat-android,#git,#thunix,#nginx,#devuan,#tilde.team,#sr.ht,#cmpwn,#tildeverse,#opennic 6:10" freenode.autojoin = "#weechat,##oodnet,#alacritty,#disroot,#fediverse,#irc.net,#lobsters,#lobsters-boil,#lxcontainers,#thelounge,#gitea,#mastodon,#pleroma,#pleroma-offtopic,#pixelfed,#pixelfed-offtopic,#oragono,#weechat-android,#git,#thunix,#nginx,#devuan,#tilde.team,#sr.ht,#cmpwn,#tildeverse,#opennic 6:10"
freenode.autorejoin freenode.autorejoin
freenode.autorejoin_delay freenode.autorejoin_delay
freenode.connection_timeout freenode.connection_timeout