Compare commits

..

No commits in common. "de7b56c49a026104a974bcc46188f68d77e0f694" and "61544ec9693178b364bc0f8cec5934f77afd9d45" have entirely different histories.

8 changed files with 17 additions and 23 deletions

View file

@ -1,3 +1,2 @@
#!/bin/bash
[ "$(tty)" = "/dev/tty1" ] && exec startx
[ `tty` == /dev/tty1 ] && exec startx
source "$HOME/.bashrc"

View file

@ -99,8 +99,4 @@ if [ -f ~/.mybashrc ]; then
. ~/.mybashrc
fi
if which fzf > /dev/null; then
eval "$(fzf --bash)"
elif [ -f ~/.fzf.bash ]; then
source ~/.fzf.bash
fi
[ -f ~/.fzf.bash ] && source ~/.fzf.bash

@ -1 +1 @@
Subproject commit afd61b5209706b58d2aa27d91c3160c2e1abf479
Subproject commit b40e15664c4fedd6d8a60a618283ff3b73f2b56d

View file

@ -22,6 +22,8 @@
editor = emacs -nw
excludesfile = ~/.gitignore
autocrlf = input
[push]
default = matching
[rebase]
autostash = true
[credential]

3
.gitmodules vendored
View file

@ -1,3 +1,6 @@
[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

View file

@ -32,6 +32,9 @@ 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

4
.speak
View file

@ -34,8 +34,8 @@ else
if [ "$FROMSTDIN" -eq 0 ]
then
xclip -o | tr '\n' ' ' | sed "s/ʼ/'/g" | $REMOTE espeak -s 410 -p 35 -v $SPEAK_LANG || true
xclip -o | tr '\n' ' ' | $REMOTE espeak -s 400 -p 35 -v $SPEAK_LANG || true
else
cat | sed "s/ʼ/'/g" | $REMOTE espeak -s 410 -p 35 -v $SPEAK_LANG || true
cat | $REMOTE espeak -s 400 -p 35 -v $SPEAK_LANG || true
fi
fi

View file

@ -1,16 +1,10 @@
Host *
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
Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
Compression yes
ForwardAgent no
KexAlgorithms curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256
ControlMaster auto
ControlPath ~/.ssh/cm-%r@%h:%p
ControlPath /tmp/%r@%h:%p
ControlPersist 60
AddKeysToAgent yes
@ -20,14 +14,11 @@ Host *.nemunai.re
# Home ################################################################
Host home
HostName merhet.iri.nemunai.re
HostName oupaout.ra.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