diff --git a/.bash_profile b/.bash_profile index 623a79a..19459b6 100644 --- a/.bash_profile +++ b/.bash_profile @@ -1,2 +1,3 @@ -[ `tty` == /dev/tty1 ] && exec startx +#!/bin/bash +[ "$(tty)" = "/dev/tty1" ] && exec startx source "$HOME/.bashrc" diff --git a/.bashrc b/.bashrc index 8f8fa4a..c29a856 100644 --- a/.bashrc +++ b/.bashrc @@ -99,4 +99,8 @@ if [ -f ~/.mybashrc ]; then . ~/.mybashrc fi -[ -f ~/.fzf.bash ] && source ~/.fzf.bash +if which fzf > /dev/null; then + eval "$(fzf --bash)" +elif [ -f ~/.fzf.bash ]; then + source ~/.fzf.bash +fi diff --git a/.emacs.d b/.emacs.d index b40e156..afd61b5 160000 --- a/.emacs.d +++ b/.emacs.d @@ -1 +1 @@ -Subproject commit b40e15664c4fedd6d8a60a618283ff3b73f2b56d +Subproject commit afd61b5209706b58d2aa27d91c3160c2e1abf479 diff --git a/.gitconfig b/.gitconfig index 973cc43..cfc2c0a 100644 --- a/.gitconfig +++ b/.gitconfig @@ -22,8 +22,6 @@ editor = emacs -nw excludesfile = ~/.gitignore autocrlf = input -[push] - default = matching [rebase] autostash = true [credential] diff --git a/.gitmodules b/.gitmodules index 39e7682..0f033d5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule ".emacs.d"] path = .emacs.d url = https://git.nemunai.re/nemunaire/conf-emacs.git -[submodule "scripts"] - path = scripts - url = https://git.nemunai.re/nemunaire/scripts.git diff --git a/.screenrc b/.screenrc index 0db668c..6a0437c 100644 --- a/.screenrc +++ b/.screenrc @@ -32,9 +32,6 @@ termcapinfo hp700 'Z0=\E[?3h:Z1=\E[?3l:hs:ts=\E[62"p\E[0$~\E[2$~\E[1$}:fs=\E[0} termcap vt100* ms:AL=\E[%dL:DL=\E[%dM:UP=\E[%dA:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC terminfo vt100* ms:AL=\E[%p1%dL:DL=\E[%p1%dM:UP=\E[%p1%dA:DO=\E[%p1%dB:LE=\E[%p1%dD:RI=\E[%p1%dC -# Hashed password to reattach -password SM4CUO61TsAFs - activity "Activity in screen %n-%t" bell_msg "Alert in screen %n-%t" hardstatus alwaysmessage diff --git a/.speak b/.speak index ccdeb97..0aa8e83 100755 --- a/.speak +++ b/.speak @@ -34,8 +34,8 @@ else if [ "$FROMSTDIN" -eq 0 ] then - xclip -o | tr '\n' ' ' | $REMOTE espeak -s 400 -p 35 -v $SPEAK_LANG || true + xclip -o | tr '\n' ' ' | sed "s/ʼ/'/g" | $REMOTE espeak -s 410 -p 35 -v $SPEAK_LANG || true else - cat | $REMOTE espeak -s 400 -p 35 -v $SPEAK_LANG || true + cat | sed "s/ʼ/'/g" | $REMOTE espeak -s 410 -p 35 -v $SPEAK_LANG || true fi fi diff --git a/.ssh/config b/.ssh/config index db35653..4792295 100644 --- a/.ssh/config +++ b/.ssh/config @@ -1,10 +1,16 @@ Host * - Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr + Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-gcm@openssh.com,aes128-ctr + KexAlgorithms sntrup761x25519-sha512@openssh.com,curve25519-sha256,curve25519-sha256@libssh.org,diffie-hellman-group18-sha512,diffie-hellman-group-exchange-sha256,diffie-hellman-group16-sha512 + MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com + RequiredRSASize 3072 + HostKeyAlgorithms sk-ssh-ed25519-cert-v01@openssh.com,ssh-ed25519-cert-v01@openssh.com,rsa-sha2-512-cert-v01@openssh.com,rsa-sha2-256-cert-v01@openssh.com,sk-ssh-ed25519@openssh.com,ssh-ed25519,rsa-sha2-512,rsa-sha2-256 + CASignatureAlgorithms sk-ssh-ed25519@openssh.com,ssh-ed25519,rsa-sha2-512,rsa-sha2-256 + HostbasedAcceptedAlgorithms sk-ssh-ed25519-cert-v01@openssh.com,ssh-ed25519-cert-v01@openssh.com,rsa-sha2-512-cert-v01@openssh.com,rsa-sha2-256-cert-v01@openssh.com,sk-ssh-ed25519@openssh.com,ssh-ed25519,rsa-sha2-512,rsa-sha2-256 + PubkeyAcceptedAlgorithms sk-ssh-ed25519-cert-v01@openssh.com,ssh-ed25519-cert-v01@openssh.com,rsa-sha2-512-cert-v01@openssh.com,rsa-sha2-256-cert-v01@openssh.com,sk-ssh-ed25519@openssh.com,ssh-ed25519,rsa-sha2-512,rsa-sha2-256 Compression yes ForwardAgent no - KexAlgorithms curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256 ControlMaster auto - ControlPath /tmp/%r@%h:%p + ControlPath ~/.ssh/cm-%r@%h:%p ControlPersist 60 AddKeysToAgent yes @@ -14,11 +20,14 @@ Host *.nemunai.re # Home ################################################################ Host home - HostName oupaout.ra.nemunai.re + HostName merhet.iri.nemunai.re VerifyHostKeyDNS yes Port 6224 DynamicForward 3128 +Host ouaset ouaset.masr.nemunai.re jizah.masr.nemunai.re jizah ankh ankh.serekh.nemunai.re uraeus uraeus.serekh.nemunai.re djed djed.serekh.nemunai.re tyet tyet.serekh.nemunai.re + User root + Host ouaset ouaset.masr.nemunai.re Port 622