diff --git a/krebs/3modules/krebs/default.nix b/krebs/3modules/krebs/default.nix index 780aeb1cf..0aa0cac9d 100644 --- a/krebs/3modules/krebs/default.nix +++ b/krebs/3modules/krebs/default.nix @@ -68,7 +68,6 @@ in { } // testHosts; users = { krebs = { - mail = "spam@krebsco.de"; pubkey = "lol"; # TODO krebs.users.krebs.pubkey should be unnecessary }; }; diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index 3e2e325d8..2357d6d26 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -50,6 +50,7 @@ in { dmenu gitAndTools.qgit lm_sensors + haskellPackages.hledger much ncdu nmap diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 36ded3b30..3bc5570c4 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -28,7 +28,12 @@ in { (servePage [ "karlaskop.de" ]) (servePage [ "makeup.apanowicz.de" ]) (servePage [ "pixelpocket.de" ]) - (servePage [ "habsys.de" "habsys.eu" ]) + (servePage [ + "habsys.de" + "habsys.eu" + "www.habsys.de" + "www.habsys.eu" + ]) (serveOwncloud [ "o.ubikmedia.de" ]) (serveWordpress [ "ubikmedia.de"