diff --git a/home/cli.nix b/home/cli.nix index 913f07f..9c0d303 100644 --- a/home/cli.nix +++ b/home/cli.nix @@ -102,8 +102,9 @@ in { emacs = { enable = true; - package = pkgs.emacsUnstable; + package = pkgs.emacsGit; extraPackages = epkgs: with epkgs; [ vterm ]; + #package = pkgs.emacsUnstable; }; gh = { diff --git a/hosts/thrall/default.nix b/hosts/thrall/default.nix index 58d05f8..4a4bbfc 100644 --- a/hosts/thrall/default.nix +++ b/hosts/thrall/default.nix @@ -215,16 +215,6 @@ in { ''; }; - "kobjolke.de" = { - forceSSL = true; - enableACME = true; - root = "/srv/www/kobjolke.de"; - serverAliases = [ "www.kobjolke.de" ]; - extraConfig = '' - add_header X-Frame-Options 'SAMEORIGIN'; - ''; - }; - # gitea "git.failco.de" = { forceSSL = true; @@ -325,7 +315,7 @@ in { mailserver = { enable = true; fqdn = "thrall.failco.de"; - domains = [ "failco.de" "jakalx.net" "kobjolke.de" ]; + domains = [ "failco.de" "jakalx.net" ]; loginAccounts = { "me@failco.de" = { @@ -334,7 +324,7 @@ in { aliases = [ "lx@failco.de" "alex@failco.de" ]; - catchAll = [ "failco.de" "kobjolke.de" ]; + catchAll = [ "failco.de" ]; }; "alex@jakalx.net" = { @@ -348,11 +338,6 @@ in { }; }; - forwards = { - "anne@kobjolke.de" = "anne.kobjolke@gmail.cem"; - "alex@kobjolke.de" = "me@failco.de"; - }; - certificateScheme = 3; enableImapSsl = true;