diff options
Diffstat (limited to 'accounts')
| -rw-r--r-- | accounts/gkleen@skadhi/default.nix | 6 | ||||
| -rw-r--r-- | accounts/gkleen@skadhi/email/default.nix | 111 | ||||
| -rw-r--r-- | accounts/gkleen@skadhi/email/relay.crt | 11 | ||||
| -rw-r--r-- | accounts/gkleen@skadhi/email/relay.key | 19 | ||||
| -rw-r--r-- | accounts/gkleen@skadhi/email/secrets.yaml | 25 | ||||
| -rw-r--r-- | accounts/gkleen@skadhi/rzm/default.nix | 52 |
6 files changed, 219 insertions, 5 deletions
diff --git a/accounts/gkleen@skadhi/default.nix b/accounts/gkleen@skadhi/default.nix index 99a592c5..e4b35a78 100644 --- a/accounts/gkleen@skadhi/default.nix +++ b/accounts/gkleen@skadhi/default.nix | |||
| @@ -3,7 +3,7 @@ let | |||
| 3 | user = config.users.users.${userName}; | 3 | user = config.users.users.${userName}; |
| 4 | in { | 4 | in { |
| 5 | imports = [ | 5 | imports = [ |
| 6 | ./greetd.nix ./rzm | 6 | ./greetd.nix ./rzm ./email |
| 7 | ] ++ (with flake.nixosModules.userProfiles.${userName}; [ | 7 | ] ++ (with flake.nixosModules.userProfiles.${userName}; [ |
| 8 | zsh mpv yt-dlp | 8 | zsh mpv yt-dlp |
| 9 | ]) ++ (with flake.nixosModules.systemProfiles; [ | 9 | ]) ++ (with flake.nixosModules.systemProfiles; [ |
| @@ -72,6 +72,8 @@ in { | |||
| 72 | "Downloads" "documents" "screenshots" "media" "projects" | 72 | "Downloads" "documents" "screenshots" "media" "projects" |
| 73 | ".local/share/direnv" | 73 | ".local/share/direnv" |
| 74 | ".config/Element" ".thunderbird" | 74 | ".config/Element" ".thunderbird" |
| 75 | ".config/chromium" | ||
| 76 | ".config/sops" | ||
| 75 | ]; | 77 | ]; |
| 76 | }; | 78 | }; |
| 77 | 79 | ||
| @@ -284,6 +286,8 @@ in { | |||
| 284 | enable = true; | 286 | enable = true; |
| 285 | serverUrl = "https://etesync.yggdrasil.li"; | 287 | serverUrl = "https://etesync.yggdrasil.li"; |
| 286 | }; | 288 | }; |
| 289 | |||
| 290 | programs.chromium.enable = true; | ||
| 287 | }; | 291 | }; |
| 288 | }; | 292 | }; |
| 289 | } | 293 | } |
diff --git a/accounts/gkleen@skadhi/email/default.nix b/accounts/gkleen@skadhi/email/default.nix new file mode 100644 index 00000000..aaf15901 --- /dev/null +++ b/accounts/gkleen@skadhi/email/default.nix | |||
| @@ -0,0 +1,111 @@ | |||
| 1 | { config, lib, pkgs, ... }: | ||
| 2 | { | ||
| 3 | services.postfix = { | ||
| 4 | enable = true; | ||
| 5 | enableSmtp = false; | ||
| 6 | enableSubmission = false; | ||
| 7 | setSendmail = true; | ||
| 8 | # networksStyle = "host"; | ||
| 9 | settings.main = { | ||
| 10 | recpipient_delimiter = "+"; | ||
| 11 | mydestination = []; | ||
| 12 | myhostname = "skadhi.midgard.yggdrasil"; | ||
| 13 | |||
| 14 | mydomain = "yggdrasil.li"; | ||
| 15 | |||
| 16 | local_transport = "error:5.1.1 No local delivery"; | ||
| 17 | alias_database = []; | ||
| 18 | alias_maps = []; | ||
| 19 | local_recipient_maps = []; | ||
| 20 | |||
| 21 | inet_interfaces = "loopback-only"; | ||
| 22 | |||
| 23 | message_size_limit = 0; | ||
| 24 | |||
| 25 | authorized_submit_users = "inline:{ gkleen= }"; | ||
| 26 | authorized_flush_users = "inline:{ gkleen= }"; | ||
| 27 | authorized_mailq_users = "inline:{ gkleen= }"; | ||
| 28 | |||
| 29 | smtp_generic_maps = "inline:{ root=root+skadhi }"; | ||
| 30 | |||
| 31 | mynetworks = ["127.0.0.0/8" "[::1]/128"]; | ||
| 32 | smtpd_client_restrictions = ["permit_mynetworks" "reject"]; | ||
| 33 | smtpd_relay_restrictions = ["permit_mynetworks" "reject"]; | ||
| 34 | |||
| 35 | sender_dependent_default_transport_maps = ''regexp:${pkgs.writeText "sender_relay" '' | ||
| 36 | /@(cip|stud)\.ifi\.(lmu|uni-muenchen)\.de$/ smtp:smtp.ifi.lmu.de | ||
| 37 | /@ifi\.(lmu|uni-muenchen)\.de$/ smtp:smtpin1.ifi.lmu.de:587 | ||
| 38 | /@math(ematik)?\.(lmu|uni-muenchen)\.de$/ smtps:smtp.math.lmu.de:465 | ||
| 39 | /@(campus\.)?lmu\.de$/ smtp:postout.lrz.de | ||
| 40 | ''}''; | ||
| 41 | sender_bcc_maps = ''regexp:${pkgs.writeText "sender_bcc" '' | ||
| 42 | /^uni2work(-[^@]*)?@ifi\.lmu\.de$/ uni2work@ifi.lmu.de | ||
| 43 | /@ifi\.lmu\.de$/ gregor.kleen@ifi.lmu.de | ||
| 44 | ''}''; | ||
| 45 | relayhost = ["[surtr.yggdrasil.li]:465"]; | ||
| 46 | default_transport = "relay"; | ||
| 47 | |||
| 48 | smtp_sasl_auth_enable = true; | ||
| 49 | smtp_sender_dependent_authentication = true; | ||
| 50 | smtp_sasl_tls_security_options = "noanonymous"; | ||
| 51 | smtp_sasl_mechanism_filter = ["plain"]; | ||
| 52 | smtp_sasl_password_maps = "regexp:/run/credentials/postfix.service/sasl_passwd"; | ||
| 53 | smtp_cname_overrides_servername = false; | ||
| 54 | smtp_always_send_ehlo = true; | ||
| 55 | smtp_tls_security_level = "dane"; | ||
| 56 | |||
| 57 | smtp_tls_loglevel = "1"; | ||
| 58 | smtp_dns_support_level = "dnssec"; | ||
| 59 | }; | ||
| 60 | settings.master = { | ||
| 61 | submission = { | ||
| 62 | type = "inet"; | ||
| 63 | private = false; | ||
| 64 | command = "smtpd"; | ||
| 65 | args = [ | ||
| 66 | "-o" "syslog_name=postfix/$service_name" | ||
| 67 | ]; | ||
| 68 | }; | ||
| 69 | smtp = { }; | ||
| 70 | smtps = { | ||
| 71 | type = "unix"; | ||
| 72 | private = true; | ||
| 73 | privileged = true; | ||
| 74 | chroot = false; | ||
| 75 | command = "smtp"; | ||
| 76 | args = [ | ||
| 77 | "-o" "smtp_tls_wrappermode=yes" | ||
| 78 | "-o" "smtp_tls_security_level=encrypt" | ||
| 79 | ]; | ||
| 80 | }; | ||
| 81 | relay = { | ||
| 82 | command = "smtp"; | ||
| 83 | args = [ | ||
| 84 | "-o" "smtp_fallback_relay=" | ||
| 85 | "-o" "smtp_tls_security_level=verify" | ||
| 86 | "-o" "smtp_tls_wrappermode=yes" | ||
| 87 | "-o" "smtp_tls_cert_file=${./relay.crt}" | ||
| 88 | "-o" "smtp_tls_key_file=/run/credentials/postfix.service/relay.key" | ||
| 89 | ]; | ||
| 90 | }; | ||
| 91 | }; | ||
| 92 | }; | ||
| 93 | |||
| 94 | systemd.services.postfix = { | ||
| 95 | serviceConfig.LoadCredential = [ | ||
| 96 | "sasl_passwd:${config.sops.secrets."postfix-sasl-passwd".path}" | ||
| 97 | "relay.key:${config.sops.secrets."relay-key".path}" | ||
| 98 | ]; | ||
| 99 | }; | ||
| 100 | |||
| 101 | sops.secrets = { | ||
| 102 | postfix-sasl-passwd = { | ||
| 103 | key = "sasl-passwd"; | ||
| 104 | sopsFile = ./secrets.yaml; | ||
| 105 | }; | ||
| 106 | relay-key = { | ||
| 107 | format = "binary"; | ||
| 108 | sopsFile = ./relay.key; | ||
| 109 | }; | ||
| 110 | }; | ||
| 111 | } | ||
diff --git a/accounts/gkleen@skadhi/email/relay.crt b/accounts/gkleen@skadhi/email/relay.crt new file mode 100644 index 00000000..ac13e7cb --- /dev/null +++ b/accounts/gkleen@skadhi/email/relay.crt | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | -----BEGIN CERTIFICATE----- | ||
| 2 | MIIBjDCCAQygAwIBAgIPQAAAAGgLfNoL/PSMAsutMAUGAytlcTAXMRUwEwYDVQQD | ||
| 3 | DAx5Z2dkcmFzaWwubGkwHhcNMjUwNDI1MTIwOTQ1WhcNMzUwNDI2MTIxNDQ1WjAR | ||
| 4 | MQ8wDQYDVQQDDAZna2xlZW4wKjAFBgMrZXADIQB3outi3/3F4YO7Q97WAAaMHW0a | ||
| 5 | m+Blldrgee+EZnWnD6N1MHMwHwYDVR0jBBgwFoAUTtn+VjMw6Ge1f68KD8dT1CWn | ||
| 6 | l3YwHQYDVR0OBBYEFFOa4rYZYMbXUVdKv98NB504GUhjMA4GA1UdDwEB/wQEAwID | ||
| 7 | 6DAMBgNVHRMBAf8EAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMCMAUGAytlcQNzABC0 | ||
| 8 | 0UgIt7gLZrU1TmzGoqPBris8R1DbKOJacicF5CU0MIIjHcX7mPFW8KtB4qm6KcPq | ||
| 9 | kF6IaEPmgKpX3Nubk8HJik9vhIy9ysfINcVTvzXx8pO1bxbvREJRyA/apj10nzav | ||
| 10 | yauId0cXHvN6g5RLAMsMAA== | ||
| 11 | -----END CERTIFICATE----- | ||
diff --git a/accounts/gkleen@skadhi/email/relay.key b/accounts/gkleen@skadhi/email/relay.key new file mode 100644 index 00000000..109241d9 --- /dev/null +++ b/accounts/gkleen@skadhi/email/relay.key | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | { | ||
| 2 | "data": "ENC[AES256_GCM,data:lBlTuzOS75pvRmcTKT4KhHMH44RlE2SvCFAUP+GfsXws1Uai7DZ1MmbhvxxCa+pcLW19+sQYxrXLRNZWby1yOeKBJ2UQeYV5LOk9LSL/WIE3FZkCo5Dv0O0gSFKjjb61WN22a4JnHbLWADf/mLT3GZv91XfvFDo=,iv:ho8wQH3UNzX9JPW5gVcUGtxZzdVwsMFus0Z4KYe5t48=,tag:dAgZyHOva2xVVhE1nTl+lg==,type:str]", | ||
| 3 | "sops": { | ||
| 4 | "age": [ | ||
| 5 | { | ||
| 6 | "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzZ2gxbU5YYVkvdkF0eTB2\nU25RL254NHp1UFlwTWtPSEpnSmp0cng1dkVjCnZuSU96V2R5OVMxcU9XSDhmT3Az\nWExhelo4Wi9nU2ZycCtyM2F0VWpVVjQKLS0tIFpHZmRNSU9aSk0yeUFkSytVaC9B\nTHBpU2RudDFHY2czYjdMZ2p5T0VPUWcKQzVYd29LnP7v5+tOatkjugEP8LGLr8Dj\nTNC8ZxVRqQwyiTM29elmzJMD1xY1unZi/jLGiDrZi7Arsc10npt2Sw==\n-----END AGE ENCRYPTED FILE-----\n", | ||
| 7 | "recipient": "age1rmmhetcmllq0ahl5qznlr0eya2zdxwl9h6y5wnl97d2wtyx5t99sm2u866" | ||
| 8 | }, | ||
| 9 | { | ||
| 10 | "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpVkltdnVzWUhDYjFPVm1w\nTmlDMGdHTlZkUVpuNEM0OGtHTkZ1ZE1jclJvCjZBUHo0NjF3S3UyWFRpV0lCREJO\nYlJpVXJ4TTMwMjBKVVF6a3RwSnZ5VWMKLS0tIGx6WkZZY0N1cGFwb0hsR3ZzOFdC\nRWxqcW5MR0JHVlBwcm43bFJKTTdaZWcKFETZni5oEHnj197CiHk56EtJO3labtFo\npe8jvh81iZIiLdZxhazhh25d3+GGT1NXtQwKcRIsGPBG5PJdul8aNg==\n-----END AGE ENCRYPTED FILE-----\n", | ||
| 11 | "recipient": "age1u6xegt79rarmyz8qy4pl7jh9lh90vx8fg0frmh4u2mzam7zydq4s4agz4e" | ||
| 12 | } | ||
| 13 | ], | ||
| 14 | "lastmodified": "2025-04-25T12:14:44Z", | ||
| 15 | "mac": "ENC[AES256_GCM,data:pObl2bJA93az9E3Ya+hA3ekI8TKKZ9NNTi0KzmWZBOiQwi9FuQYtpnmmT80L1KXWyOKJV6wGdAri3mNe/ue2S0TziSbQ/4+Dj4ubFKgkH7thb5q2dFyxw5FzhYzRQiXFqD/pxcNN9uL0lQI2Al0Eci0zX8Kcd1rAQ6RzLEoSmco=,iv:zo/3QFKTUEDxLy1k5yyU7Z1JMZ7cKdYUc6GHjaTTZKQ=,tag:f63Eja3lBfwJCYAOyEt56g==,type:str]", | ||
| 16 | "unencrypted_suffix": "_unencrypted", | ||
| 17 | "version": "3.10.2" | ||
| 18 | } | ||
| 19 | } | ||
diff --git a/accounts/gkleen@skadhi/email/secrets.yaml b/accounts/gkleen@skadhi/email/secrets.yaml new file mode 100644 index 00000000..fa634212 --- /dev/null +++ b/accounts/gkleen@skadhi/email/secrets.yaml | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | sasl-passwd: ENC[AES256_GCM,data:L5QOQTEOplm9rQ+PuyDUl492ZTgIgZdRXNCNRaPQ4FLU+ha0GO7rjYWAOtvW7/oVdALrkQveSpBolnLG0nayvkjLpPuA6o9brR6bky52QmhOd8cYN9LMOhJcLJTwpUuvDesXkJD1mWA+ifuPnK6elVEfPuOndzMyw8MEvbPl53yCKQ7HOJc2nGvneD5QFkiHB9W9MmrR1gjGqaCSjZ0ahCnxe/Z2SwqccmBR9l60vt683RXMYbKNLDuSgE7HcXbzF9NstfnoSq7b332y/NgYsXvY0w+f6yPhsDuPhUXU+7gIcPb4+1TFOtdZP8uIPm1aLqG2nNKNhMGt23X8dD5Myy0FF6XmbTj43mDzKJahNel7pT91d+Vac5s08UeyUpQSjtrVMYneVTYbHEwiFPAD7S57LF0kZuE1aXIRF35g6XV3GB4rQDsrBsrZzn9vsGS12L2pdtYFVCvt/dLFlmd/GjPpm4JWyNSg,iv:fUEBrr1iby7+hK8ZesW+77HLMW93c6LpCcoJy8pgXUE=,tag:cW8vKVAebnJqo1gNNwDohQ==,type:str] | ||
| 2 | sops: | ||
| 3 | age: | ||
| 4 | - enc: | | ||
| 5 | -----BEGIN AGE ENCRYPTED FILE----- | ||
| 6 | YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpQVM4V3RZNTUyZzN4bERP | ||
| 7 | SnRhM2hOK2FzNDRzRTR0bG4yYk1YS0tMclZrCkIrQWdBcnBkeU1wbWVZOEN4T0lY | ||
| 8 | c0lnaWtidTJLQjV0c3Rzd3o3alNIekkKLS0tIG5lZjQ5MWZoVGNIaTROOXJpdDhC | ||
| 9 | R3hyNlcxN2RQRS9aOGI4RzVPbUtBY3MKBKWGmZjjqZ7CBwVniEF9VjhyWH0kZv56 | ||
| 10 | 7eWx3lOhb849izKM8EEjr50t1DqrvBLL4KStLq8fbNV5uPotGuKOwA== | ||
| 11 | -----END AGE ENCRYPTED FILE----- | ||
| 12 | recipient: age1rmmhetcmllq0ahl5qznlr0eya2zdxwl9h6y5wnl97d2wtyx5t99sm2u866 | ||
| 13 | - enc: | | ||
| 14 | -----BEGIN AGE ENCRYPTED FILE----- | ||
| 15 | YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDbStwZ0w5STFxcHNKNDhO | ||
| 16 | SnhZVHprVUlkUStvVXNpTW5RZ0dTSVpLWEZjCjdDa1ZtOU5KUjJxSHRlNy9WamJq | ||
| 17 | a0VEdUtiODdCL3RTeDlTc2NqY0Q1dDgKLS0tIGcwNkQxemVuSGw4V2RQNWp1cjhM | ||
| 18 | cHQ4WXBPNGJGRXZTL1kxSDhRb1c0ZVUKIhyhHihWR79vQBBNuaVLzIAFggmfdkM8 | ||
| 19 | 40/m+3OllYsTCvm55LdNVNjxQC8QnfsalgtIh+ZzUzhrjCksumqypw== | ||
| 20 | -----END AGE ENCRYPTED FILE----- | ||
| 21 | recipient: age1u6xegt79rarmyz8qy4pl7jh9lh90vx8fg0frmh4u2mzam7zydq4s4agz4e | ||
| 22 | lastmodified: "2022-02-02T14:45:23Z" | ||
| 23 | mac: ENC[AES256_GCM,data:UdM/VmdfqhYm1aFCHaO0mbJA/oyV/J2oKVVmGDa0Co3MWq9aWMqP726O+rLk36W0HOG4fmue//R1Q524au2hMW9bZUFzrubfQt2V78tZRZeHCJSRmOmi1D1EDdfPz9J3oWDvIEgIIsAk5H5EuuH0j6FILye6tzcomNGDAKZbwuc=,iv:a7dJAqkcroLp01gkGKV5gm6gTIIMa/9P8qJn44ISrw0=,tag:R9/6X6mgfVSLK7bmoWRnfQ==,type:str] | ||
| 24 | unencrypted_suffix: _unencrypted | ||
| 25 | version: 3.7.1 | ||
diff --git a/accounts/gkleen@skadhi/rzm/default.nix b/accounts/gkleen@skadhi/rzm/default.nix index efe5468e..11d8af8b 100644 --- a/accounts/gkleen@skadhi/rzm/default.nix +++ b/accounts/gkleen@skadhi/rzm/default.nix | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | { config, pkgs, ... }: | 1 | { config, pkgs, lib, ... }: |
| 2 | let | 2 | let |
| 3 | mwnSubnetsPublic = | 3 | mwnSubnetsPublic = |
| 4 | [ "129.187.0.0/16" "141.40.0.0/16" "141.84.0.0/16" | 4 | [ "129.187.0.0/16" "141.40.0.0/16" "141.84.0.0/16" |
| @@ -98,9 +98,15 @@ in { | |||
| 98 | }; | 98 | }; |
| 99 | 99 | ||
| 100 | home-manager.users.gkleen = { sysConfig, config, ... }: { | 100 | home-manager.users.gkleen = { sysConfig, config, ... }: { |
| 101 | home.persistence."/persistent".files = [ | 101 | home.persistence."/persistent" = { |
| 102 | "rz.kdbx" ".config/Element-lmu" | 102 | files = [ |
| 103 | ]; | 103 | "rz.kdbx" |
| 104 | ]; | ||
| 105 | directories = [ | ||
| 106 | ".config/Element-lmu" ".config/worktime" | ||
| 107 | ".config/chromium-kimai" ".config/chromium-rainbow" | ||
| 108 | ]; | ||
| 109 | }; | ||
| 104 | 110 | ||
| 105 | xdg.desktopEntries = { | 111 | xdg.desktopEntries = { |
| 106 | element-lmu = { | 112 | element-lmu = { |
| @@ -124,6 +130,44 @@ in { | |||
| 124 | StartupNotify = "true"; | 130 | StartupNotify = "true"; |
| 125 | }; | 131 | }; |
| 126 | }; | 132 | }; |
| 133 | rainbow = { | ||
| 134 | name = "Rainbow"; | ||
| 135 | exec = toString (pkgs.writeShellScript "rainbow" '' | ||
| 136 | exec -- \ | ||
| 137 | ${lib.getExe' sysConfig.systemd.package "systemd-run"} --wait --user --slice-inherit \ | ||
| 138 | --property 'CPUAccounting=yes' --property 'CPUQuotaPeriodSec=50ms' \ | ||
| 139 | -E DSCP=46 -E NIXOS_OZONE_WL \ | ||
| 140 | -- ${lib.getExe pkgs.dscp} ${lib.getExe config.programs.chromium.package} \ | ||
| 141 | --class=Rainbow \ | ||
| 142 | --app="https://web.openrainbow.com" \ | ||
| 143 | --user-data-dir=''${HOME}/.config/chromium-rainbow | ||
| 144 | ''); | ||
| 145 | icon = pkgs.fetchurl { | ||
| 146 | url = "https://web.openrainbow.com/rb/2.174.21/assets/skins/rainbow/images/homepage/logo__rainbow.svg"; | ||
| 147 | hash = "sha256-5fmo8rDqVDpzkGaPjk4Y+SsSZpAsY7VUQSFW6WdHwuU="; | ||
| 148 | }; | ||
| 149 | settings = { | ||
| 150 | StartupWMClass = "Rainbow"; | ||
| 151 | }; | ||
| 152 | }; | ||
| 153 | kimai = { | ||
| 154 | name = "Kimai"; | ||
| 155 | exec = toString (pkgs.writeShellScript "kimai" '' | ||
| 156 | exec -- \ | ||
| 157 | ${lib.getExe config.programs.chromium.package} \ | ||
| 158 | --class=Kimai \ | ||
| 159 | --app="https://kimai.yggdrasil.li" \ | ||
| 160 | --user-data-dir=''${HOME}/.config/chromium-kimai | ||
| 161 | ''); | ||
| 162 | icon = pkgs.fetchurl { | ||
| 163 | url = "https://www.kimai.org/images/kimai_logo.png"; | ||
| 164 | hash = "sha256-lnlOttzR2SwXA70R+egJUkeKr4U5V0avqTk8uX4bqfs="; | ||
| 165 | }; | ||
| 166 | settings = { | ||
| 167 | StartupWMClass = "Kimai"; | ||
| 168 | StartupNotify = "true"; | ||
| 169 | }; | ||
| 170 | }; | ||
| 127 | }; | 171 | }; |
| 128 | 172 | ||
| 129 | programs.zsh.dirHashes = { | 173 | programs.zsh.dirHashes = { |
