diff options
| -rw-r--r-- | accounts/gkleen@skadhi/default.nix | 2 | ||||
| -rw-r--r-- | accounts/gkleen@skadhi/emacs/emacs.el | 3 | ||||
| -rw-r--r-- | accounts/gkleen@skadhi/rzm/default.nix | 15 | ||||
| -rw-r--r-- | 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 { | |||
| 314 | }; | 314 | }; |
| 315 | }; | 315 | }; |
| 316 | }; | 316 | }; |
| 317 | |||
| 318 | programs.libreoffice.enable = true; | ||
| 317 | }; | 319 | }; |
| 318 | }; | 320 | }; |
| 319 | } | 321 | } |
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." | |||
| 257 | (let ((ssh_auth_sock (string-chop-newline (shell-command-to-string "gpgconf --list-dirs agent-ssh-socket")))) (setenv "SSH_AUTH_SOCK" ssh_auth_sock)) | 257 | (let ((ssh_auth_sock (string-chop-newline (shell-command-to-string "gpgconf --list-dirs agent-ssh-socket")))) (setenv "SSH_AUTH_SOCK" ssh_auth_sock)) |
| 258 | (setenv "SSH_ASKPASS_REQUIRE" "prefer") | 258 | (setenv "SSH_ASKPASS_REQUIRE" "prefer") |
| 259 | (setenv "SSH_ASKPASS" "@ksshaskpass@") | 259 | (setenv "SSH_ASKPASS" "@ksshaskpass@") |
| 260 | |||
| 261 | (define-key typst-ts-mode-map (kbd "C-<left>") nil) | ||
| 262 | (define-key typst-ts-mode-map (kbd "C-<right>") 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 { | |||
| 224 | User = "root"; | 224 | User = "root"; |
| 225 | inherit (config.programs.ssh.autosshProxies."mathw0h") ProxyCommand; | 225 | inherit (config.programs.ssh.autosshProxies."mathw0h") ProxyCommand; |
| 226 | }; | 226 | }; |
| 227 | "gitlab-ce.lrz.de" = { | ||
| 228 | User = "git"; | ||
| 229 | IdentityFile = "~/.ssh/gkleen@gitlab-ce.lrz.de"; | ||
| 230 | }; | ||
| 231 | "gitlab.lrz.de" = { | ||
| 232 | User = "git"; | ||
| 233 | IdentityFile = "~/.ssh/gkleen@gitlab.lrz.de"; | ||
| 234 | }; | ||
| 235 | "vrt-kvm05" = { | ||
| 236 | User = "root"; | ||
| 237 | inherit (config.programs.ssh.autosshProxies."mathw0e") ProxyCommand; | ||
| 238 | PasswordAuthentication = "yes"; | ||
| 239 | }; | ||
| 227 | "*.mathinst.loc" = { | 240 | "*.mathinst.loc" = { |
| 228 | header = "Match host *.mathinst.loc,*.cipmath.loc,*.math.lmu.de"; | 241 | header = "Match host *.mathinst.loc,*.cipmath.loc,*.math.lmu.de"; |
| 229 | IdentityFile = "~/.ssh/gkleen@mathinst.loc"; | 242 | IdentityFile = "~/.ssh/gkleen@mathinst.loc"; |
| @@ -253,6 +266,8 @@ in { | |||
| 253 | home.packages = with pkgs; [ | 266 | home.packages = with pkgs; [ |
| 254 | cups | 267 | cups |
| 255 | ]; | 268 | ]; |
| 269 | |||
| 270 | fonts.lmu-hausschrift.enable = true; | ||
| 256 | }; | 271 | }; |
| 257 | }; | 272 | }; |
| 258 | } | 273 | } |
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 { | |||
| 113 | ct state new counter name reject-icmp-fw reject | 113 | ct state new counter name reject-icmp-fw reject |
| 114 | } | 114 | } |
| 115 | 115 | ||
| 116 | chain input_tmp {} | 116 | ct helper ftp-standard { |
| 117 | type "ftp" protocol tcp | ||
| 118 | } | ||
| 119 | chain input_pr_tmp { | ||
| 120 | # tcp dport 2121 ct helper set "ftp-standard" | ||
| 121 | } | ||
| 122 | chain input_pr { | ||
| 123 | type filter hook prerouting priority 0 | ||
| 124 | |||
| 125 | jump input_pr_tmp | ||
| 126 | } | ||
| 127 | |||
| 128 | chain input_tmp { | ||
| 129 | # tcp dport 2121 accept | ||
| 130 | } | ||
| 117 | chain input { | 131 | chain input { |
| 118 | type filter hook input priority filter | 132 | type filter hook input priority filter |
| 119 | policy drop | 133 | policy drop |
