From dfcb663af9b116d07ec09603a6837230419a2785 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 1 Aug 2017 13:47:10 +0200 Subject: l mail: show html mails --- lass/2configs/mail.nix | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lass') diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix index fe82fea5..cfc17984 100644 --- a/lass/2configs/mail.nix +++ b/lass/2configs/mail.nix @@ -15,6 +15,10 @@ let ${pkgs.msmtp}/bin/msmtp -C ${msmtprc} "$@" ''; + mailcap = pkgs.writeText "mailcap" '' + text/html; ${pkgs.elinks}/bin/elinks -dump ; copiousoutput; + ''; + muttrc = pkgs.writeText "muttrc" '' # gpg source ${pkgs.neomutt}/share/doc/mutt/samples/gpg.rc @@ -37,6 +41,9 @@ let set crypt_verify_sig=\$my_crypt_verify_sig" \ 'Verify PGP signature' + # read html mails + auto_view text/html + set mailcap_path = ${mailcap} # notmuch set nm_default_uri="notmuch://$HOME/Maildir" # path to the maildir -- cgit v1.2.3 From e740022bc524a57dd671a5c714ab117b6331cf27 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 1 Aug 2017 14:15:45 +0200 Subject: l mail: use ISO date format --- lass/2configs/mail.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix index cfc17984..afd90315 100644 --- a/lass/2configs/mail.nix +++ b/lass/2configs/mail.nix @@ -66,7 +66,7 @@ let recipent="$(echo $1 | sed 's/[^,]*<\([^>]*\)[^,]*/ \1/g')" # output to mutt # V - echo "%4C %Z %?GI?%GI& ? %[%d/%b] %-20.20a %?M?(%3M)& ? %s %> $recipent %?g?%g?%" + echo "%4C %Z %?GI?%GI& ? %[%y-%m-%d] %-20.20a %?M?(%3M)& ? %s %> $recipent %?g?%g?%" # args to mutt-index dash script # V ''} %r |" -- cgit v1.2.3 From d56a90778408a199cc79ab47e1c2313a68cd2451 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 1 Aug 2017 18:06:13 +0200 Subject: l mail: activate indexbar in mailview --- lass/2configs/mail.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lass') diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix index afd90315..a90890aa 100644 --- a/lass/2configs/mail.nix +++ b/lass/2configs/mail.nix @@ -126,6 +126,8 @@ let bind pager t noop macro index t "+TODO\n" # tag as Archived + # top index bar in email view + set pager_index_lines=7 # sidebar set sidebar_width = 20 -- cgit v1.2.3 From 95aef46c56564ce82e3f0e864cc0508e310a0825 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 1 Aug 2017 20:18:38 +0200 Subject: l statig_nginx: RIP --- lass/3modules/static_nginx.nix | 78 ------------------------------------------ 1 file changed, 78 deletions(-) delete mode 100644 lass/3modules/static_nginx.nix (limited to 'lass') diff --git a/lass/3modules/static_nginx.nix b/lass/3modules/static_nginx.nix deleted file mode 100644 index cd33a2cf..00000000 --- a/lass/3modules/static_nginx.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ config, lib, pkgs, ... }: - -with import ; - -let - cfg = config.lass.staticPage; - - out = { - options.lass.staticPage = api; - config = imp; - }; - - api = mkOption { - type = with types; attrsOf (submodule ({ config, ... }: { - options = { - domain = mkOption { - type = str; - default = config._module.args.name; - }; - folder = mkOption { - type = str; - default = "/srv/http/${config.domain}"; - }; - #sslEnable = mkEnableOption "ssl"; - #certificate = mkOption { - # type = str; - #}; - #certificate_key = mkOption { - # type = str; - #}; - #ciphers = mkOption { - # type = str; - # default = "AES128+EECDH:AES128+EDH"; - #}; - ssl = mkOption { - type = with types; submodule ({ - options = { - enable = mkEnableOption "ssl"; - certificate = mkOption { - type = str; - }; - certificate_key = mkOption { - type = str; - }; - }; - }); - default = {}; - }; - }; - })); - default = {}; - }; - - user = config.services.nginx.user; - group = config.services.nginx.group; - - external-ip = config.krebs.build.host.nets.internet.ip4.addr; - - imp = { - krebs.nginx.servers = flip mapAttrs cfg ( name: { domain, folder, ssl, ... }: { - server-names = [ - "${domain}" - "www.${domain}" - ]; - locations = [ - (nameValuePair "/" '' - root ${folder}; - '') - (nameValuePair "~ /\\." '' - deny all; - '') - ]; - inherit ssl; - - }); - }; - -in out -- cgit v1.2.3 From 8c9e0ad35d330e980a59c57b89715c21971c1819 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 1 Aug 2017 20:47:34 +0200 Subject: l websites: add default.nix for 404 --- lass/2configs/websites/default.nix | 26 ++++++++++++++++++++++++++ lass/2configs/websites/domsen.nix | 1 + lass/2configs/websites/fritz.nix | 1 + lass/2configs/websites/lassulus.nix | 1 + 4 files changed, 29 insertions(+) create mode 100644 lass/2configs/websites/default.nix (limited to 'lass') diff --git a/lass/2configs/websites/default.nix b/lass/2configs/websites/default.nix new file mode 100644 index 00000000..1ffa105a --- /dev/null +++ b/lass/2configs/websites/default.nix @@ -0,0 +1,26 @@ +{ config, lib, ... }: + +with import ; + +{ + services.nginx = { + recommendedGzipSettings = true; + recommendedOptimisation = true; + recommendedTlsSettings = true; + + virtualHosts._http = { + default = true; + extraConfig = '' + return 404; + ''; + }; + + virtualHosts.default = { + locations."= /etc/os-release".extraConfig = '' + default_type text/plain; + alias /etc/os-release; + ''; + }; + }; +} + diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index b0e5375c..10ff142f 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -23,6 +23,7 @@ let in { imports = [ + ./default.nix ./sqlBackup.nix (servePage [ "reich-gebaeudereinigung.de" "www.reich-gebaeudereinigung.de" ]) (servePage [ diff --git a/lass/2configs/websites/fritz.nix b/lass/2configs/websites/fritz.nix index 45927b10..aa57a985 100644 --- a/lass/2configs/websites/fritz.nix +++ b/lass/2configs/websites/fritz.nix @@ -26,6 +26,7 @@ in { services.nginx.enable = true; imports = [ + ./default.nix ./sqlBackup.nix (serveWordpress [ "radical-dreamers.de" "www.radical-dreamers.de" ]) diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix index 0771570c..93b817c3 100644 --- a/lass/2configs/websites/lassulus.nix +++ b/lass/2configs/websites/lassulus.nix @@ -8,6 +8,7 @@ let in { imports = [ + ./default.nix ../git.nix ]; -- cgit v1.2.3