This commit is contained in:
Geoffrey Frogeye 2020-09-24 10:47:35 +02:00
parent d3849148cb
commit 78bbd1b44d
5 changed files with 17 additions and 207 deletions

View file

@ -36,7 +36,7 @@ class BarGroupType(enum.Enum):
class BarStdoutThread(threading.Thread): class BarStdoutThread(threading.Thread):
def run(self): def run(self) -> None:
while Bar.running: while Bar.running:
handle = Bar.process.stdout.readline().strip() handle = Bar.process.stdout.readline().strip()
if not len(handle): if not len(handle):
@ -58,7 +58,7 @@ class Bar:
FONTSIZE = 10 FONTSIZE = 10
@staticmethod @staticmethod
def init(): def init() -> None:
Bar.running = True Bar.running = True
Section.init() Section.init()
@ -75,7 +75,7 @@ class Bar:
# Bar(1) # Bar(1)
@staticmethod @staticmethod
def stop(): def stop() -> None:
Bar.running = False Bar.running = False
Bar.process.kill() Bar.process.kill()
@ -83,11 +83,11 @@ class Bar:
os.killpg(os.getpid(), signal.SIGTERM) os.killpg(os.getpid(), signal.SIGTERM)
@staticmethod @staticmethod
def run(): def run() -> None:
Bar.forever() Bar.forever()
i3 = i3ipc.Connection() i3 = i3ipc.Connection()
def doStop(*args): def doStop(*args) -> None:
Bar.stop() Bar.stop()
print(88) print(88)
@ -176,6 +176,7 @@ class Bar:
# Color for empty sections # Color for empty sections
Bar.string += BarGroup.color(*Section.EMPTY) Bar.string += BarGroup.color(*Section.EMPTY)
# print(Bar.string)
Bar.process.stdin.write(bytes(Bar.string + '\n', 'utf-8')) Bar.process.stdin.write(bytes(Bar.string + '\n', 'utf-8'))
Bar.process.stdin.flush() Bar.process.stdin.flush()

View file

@ -20,7 +20,13 @@ then
grep -o '^[^#]*' ~/.config/inputrc > "${WORK}/.inputrc" grep -o '^[^#]*' ~/.config/inputrc > "${WORK}/.inputrc"
grep -o '^[^"]*' ~/.config/vim/vimconfig.vim > "${WORK}/.vimrc" grep -o '^[^"]*' ~/.config/vim/vimconfig.vim > "${WORK}/.vimrc"
mkdir -p "${WORK}/terminfo/${TERM:0:1}" mkdir -p "${WORK}/terminfo/${TERM:0:1}"
cp ~/".config/terminfo/${TERM:0:1}/${TERM}" "${WORK}/terminfo/${TERM:0:1}/${TERM}" if [ -f "/usr/share/terminfo/${TERM:0:1}/${TERM}" ]
then
cp "/usr/share/terminfo/${TERM:0:1}/${TERM}" "${WORK}/terminfo/${TERM:0:1}/${TERM}"
elif [ -f "$HOME/.config/terminfo/${TERM:0:1}/${TERM}" ]
then
cp "$HOME/.config/terminfo/${TERM:0:1}/${TERM}" "${WORK}/terminfo/${TERM:0:1}/${TERM}"
fi
# Extra configuration # Extra configuration
echo "alias s='sudo -s -E bash --rcfile ${DEST}/.bashrc'" >> "${WORK}/.bashrc" echo "alias s='sudo -s -E bash --rcfile ${DEST}/.bashrc'" >> "${WORK}/.bashrc"

View file

@ -118,8 +118,6 @@ then
if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
fi fi
export GPG_TTY=$(tty)
gpg-connect-agent updatestartuptty /bye >/dev/null
else else
# Start regular SSH agent if not already started # Start regular SSH agent if not already started

View file

@ -100,3 +100,7 @@ unset _i_prefer
trysource ~/.local/bin/colorSchemeApply trysource ~/.local/bin/colorSchemeApply
# Needed because xterm/urxvt won't use the last color, needed for vim # Needed because xterm/urxvt won't use the last color, needed for vim
## GPG
# Update TTY
export GPG_TTY=$(tty)
gpg-connect-agent updatestartuptty /bye >/dev/null

File diff suppressed because one or more lines are too long