summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2024-03-12 12:43:22 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2024-03-12 12:43:22 +0100
commit2f8b062363b293a72e4afa0e682f1c4371317515 (patch)
tree7816d626414befba3f5d2e76b82dc843694ca4eb
parenta5c1381a8057d5490341ffa91a4807f6ecfa0a26 (diff)
downloadnixos-flakes.tar
nixos-flakes.tar.gz
nixos-flakes.tar.bz2
nixos-flakes.tar.xz
nixos-flakes.zip
-rw-r--r--accounts/gkleen@sif/default.nix2
-rw-r--r--accounts/gkleen@sif/ssh-hosts.nix1
-rw-r--r--user-profiles/yt-dlp.nix1
3 files changed, 3 insertions, 1 deletions
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index d40b1c92..05cfc2c8 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -136,7 +136,7 @@ in {
136 KbdInteractiveAuthentication yes 136 KbdInteractiveAuthentication yes
137 UpdateHostKeys yes 137 UpdateHostKeys yes
138 GlobalKnownHostsFile ${pkgs.writeText "ssh_known_hosts" '' 138 GlobalKnownHostsFile ${pkgs.writeText "ssh_known_hosts" ''
139 @cert-authority *.mathinst.loc,*.math.lmu.de ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBUTFpVCdETCXiDSDl7YGbR1J4BLTsoBzjDtflHJGO/z ssh-pki@mgmt01 139 @cert-authority *.mathinst.loc,*.math.lmu.de,*.cipmath.loc ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBUTFpVCdETCXiDSDl7YGbR1J4BLTsoBzjDtflHJGO/z ssh-pki@mgmt01
140 ''} 140 ''}
141 141
142 Match host *.mathinst.loc,*.math.lmu.de !host ssh.math.lmu.de !exec "nc -z -w 1 %h %p &>/dev/null" 142 Match host *.mathinst.loc,*.math.lmu.de !host ssh.math.lmu.de !exec "nc -z -w 1 %h %p &>/dev/null"
diff --git a/accounts/gkleen@sif/ssh-hosts.nix b/accounts/gkleen@sif/ssh-hosts.nix
index 8cc0f04e..f141ca8e 100644
--- a/accounts/gkleen@sif/ssh-hosts.nix
+++ b/accounts/gkleen@sif/ssh-hosts.nix
@@ -546,6 +546,7 @@
546 extraOptions = { 546 extraOptions = {
547 PasswordAuthentication = "yes"; 547 PasswordAuthentication = "yes";
548 KbdInteractiveAuthentication = "yes"; 548 KbdInteractiveAuthentication = "yes";
549 HostKeyAlgorithms = "+ecdsa-sha2-nistp256";
549 }; 550 };
550 }; 551 };
551} 552}
diff --git a/user-profiles/yt-dlp.nix b/user-profiles/yt-dlp.nix
index 91f970bf..4ec6d6f7 100644
--- a/user-profiles/yt-dlp.nix
+++ b/user-profiles/yt-dlp.nix
@@ -23,6 +23,7 @@
23 "youtube:player-client=android,web" 23 "youtube:player-client=android,web"
24 "youtube:formats=dashy" 24 "youtube:formats=dashy"
25 ]; 25 ];
26 remux-video = "mp4>mkv";
26 }; 27 };
27 }; 28 };
28 }; 29 };