From 130e46a15020e5b88898ad45a500982135e0a786 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 5 Oct 2026 13:36:42 +0200 Subject: ... --- accounts/gkleen@skadhi/default.nix | 2 ++ accounts/gkleen@skadhi/emacs/emacs.el | 3 --- accounts/gkleen@skadhi/rzm/default.nix | 15 +++++++++++++++ hosts/skadhi/networking/ruleset.nft | 16 +++++++++++++++- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/accounts/gkleen@skadhi/default.nix b/accounts/gkleen@skadhi/default.nix index f8de3182..e3b0da2e 100644 --- a/accounts/gkleen@skadhi/default.nix +++ b/accounts/gkleen@skadhi/default.nix @@ -314,6 +314,8 @@ in { }; }; }; + + programs.libreoffice.enable = true; }; }; } diff --git a/accounts/gkleen@skadhi/emacs/emacs.el b/accounts/gkleen@skadhi/emacs/emacs.el index a9d22621..42d8b625 100644 --- a/accounts/gkleen@skadhi/emacs/emacs.el +++ b/accounts/gkleen@skadhi/emacs/emacs.el @@ -257,6 +257,3 @@ necessarily running." (let ((ssh_auth_sock (string-chop-newline (shell-command-to-string "gpgconf --list-dirs agent-ssh-socket")))) (setenv "SSH_AUTH_SOCK" ssh_auth_sock)) (setenv "SSH_ASKPASS_REQUIRE" "prefer") (setenv "SSH_ASKPASS" "@ksshaskpass@") - -(define-key typst-ts-mode-map (kbd "C-") nil) -(define-key typst-ts-mode-map (kbd "C-") nil) diff --git a/accounts/gkleen@skadhi/rzm/default.nix b/accounts/gkleen@skadhi/rzm/default.nix index ce36f0b3..ef30278b 100644 --- a/accounts/gkleen@skadhi/rzm/default.nix +++ b/accounts/gkleen@skadhi/rzm/default.nix @@ -224,6 +224,19 @@ in { User = "root"; inherit (config.programs.ssh.autosshProxies."mathw0h") ProxyCommand; }; + "gitlab-ce.lrz.de" = { + User = "git"; + IdentityFile = "~/.ssh/gkleen@gitlab-ce.lrz.de"; + }; + "gitlab.lrz.de" = { + User = "git"; + IdentityFile = "~/.ssh/gkleen@gitlab.lrz.de"; + }; + "vrt-kvm05" = { + User = "root"; + inherit (config.programs.ssh.autosshProxies."mathw0e") ProxyCommand; + PasswordAuthentication = "yes"; + }; "*.mathinst.loc" = { header = "Match host *.mathinst.loc,*.cipmath.loc,*.math.lmu.de"; IdentityFile = "~/.ssh/gkleen@mathinst.loc"; @@ -253,6 +266,8 @@ in { home.packages = with pkgs; [ cups ]; + + fonts.lmu-hausschrift.enable = true; }; }; } diff --git a/hosts/skadhi/networking/ruleset.nft b/hosts/skadhi/networking/ruleset.nft index 62339f69..94e21b10 100644 --- a/hosts/skadhi/networking/ruleset.nft +++ b/hosts/skadhi/networking/ruleset.nft @@ -113,7 +113,21 @@ table inet filter { ct state new counter name reject-icmp-fw reject } - chain input_tmp {} + ct helper ftp-standard { + type "ftp" protocol tcp + } + chain input_pr_tmp { + # tcp dport 2121 ct helper set "ftp-standard" + } + chain input_pr { + type filter hook prerouting priority 0 + + jump input_pr_tmp + } + + chain input_tmp { + # tcp dport 2121 accept + } chain input { type filter hook input priority filter policy drop -- cgit v1.2.3