From a5678783c2b683d8c8d81ab112acc893a4a09b29 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Mon, 20 May 2024 17:49:57 +0200 Subject: [PATCH 1/9] git: Reset to default push behaviour --- .gitconfig | 2 -- 1 file changed, 2 deletions(-) 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] From 5821af748eabf8411c033af9d07fe05d227586f3 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Sat, 23 Aug 2025 07:32:03 +0200 Subject: [PATCH 2/9] Update ssh config --- .ssh/config | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.ssh/config b/.ssh/config index db35653..0f9f16b 100644 --- a/.ssh/config +++ b/.ssh/config @@ -4,7 +4,7 @@ Host * 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 +14,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 From 8136a19ae57ee2f17ea21a541343d56877d7b2b4 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Sat, 23 Aug 2025 07:32:34 +0200 Subject: [PATCH 3/9] Latest espeak tweaks --- .speak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 0594f6372ef9e05d73b874fb71181bf896871f90 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Sun, 11 Jan 2026 16:42:04 +0700 Subject: [PATCH 4/9] Hardenize ssh configuration --- .ssh/config | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.ssh/config b/.ssh/config index 0f9f16b..4792295 100644 --- a/.ssh/config +++ b/.ssh/config @@ -1,8 +1,14 @@ 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 ~/.ssh/cm-%r@%h:%p ControlPersist 60 From d226434f42af6be9cbdd4ffcf38a19cafb051b36 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Sat, 24 Jan 2026 09:26:59 +0800 Subject: [PATCH 5/9] Use fzf if installed on the system --- .bashrc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 From b06e29e5c81c9fb5c45d42625e1039c9385fb229 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Sat, 24 Jan 2026 09:31:56 +0800 Subject: [PATCH 6/9] Improve .bash_profile --- .bash_profile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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" From 58fdf834dd52a1077e02dd70586f61dce409fe98 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Sat, 24 Jan 2026 09:41:25 +0800 Subject: [PATCH 7/9] Update emacs.d --- .emacs.d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 37c6508221a62adbb29b41f8a6294297a695e1ec Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Sat, 24 Jan 2026 09:42:03 +0800 Subject: [PATCH 8/9] Remove screen password --- .screenrc | 3 --- 1 file changed, 3 deletions(-) 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 From de7b56c49a026104a974bcc46188f68d77e0f694 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Sat, 24 Jan 2026 09:42:34 +0800 Subject: [PATCH 9/9] Remove scripts module --- .gitmodules | 3 --- 1 file changed, 3 deletions(-) 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