diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 84206b8f..30fd7680 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -167,7 +167,7 @@ alias i='iwctl station wlan0' cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" } # dotdrop -alias dotdrop="source $DOTREPO/secrets/secrets && UID=$(id -u) dotdrop --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p Isengard{%@@ endif @@%}" +alias dotdrop="source $DOTREPO/secrets/secrets && {%@@ if distro_id != "termux" @@%} UID=$(id -u) {%@@ endif @@%} dotdrop --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p Isengard{%@@ endif @@%}" alias sdotdrop="source $DOTREPO/secrets/secrets && sudo -E dotdrop --cfg=$DOTREPO/config-root.toml" diff --git a/home/.ssh/config b/home/.ssh/config index 0a97b703..27720693 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -11,11 +11,12 @@ host moria HostName korhonen.cc port 221 User balrog - StreamLocalBindUnlink yes + {%@@ if distro_id != "termux" @@%} # Forward GPG agent StreamLocalBindUnlink yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh + {%@@ endif @@%} host beleriand HostName beleriand.korhonen.lan @@ -29,15 +30,6 @@ host rivendell HostName rivendell.korhonen.lan User root -host tirion - HostName tirion.korhonen.cc - port 22 - User gandalf - # Forward GPG agent - StreamLocalBindUnlink yes - RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra - RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh - host forgejo HostName git.korhonen.cc port 2882 @@ -68,11 +60,12 @@ host gondor hostname tolkku.net port 22 User reekymarko - StreamLocalBindUnlink yes + {%@@ if distro_id != "termux" @@%} # Forward GPG agent StreamLocalBindUnlink yes RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh + {%@@ endif @@%} host anitta HostName 10.200.200.4