c3d2/nix-config
c3d2
/
nix-config
24
7
Fork 3
Code Issues 12 Pull Requests 2 Releases Wiki Activity

Compare commits

base: c3d2:527cf48be835cee74ae65085d442e68cff22823c
Branches Tags
c3d2:master
c3d2:flake-update
c3d2:gitea-actions-runner
c3d2:nixos-23.11
c3d2:ds-future
c3d2:container/radius
...
compare: c3d2:71ca8ebceddb95b54243f05508fbc0ce9aa680f7
Branches Tags
c3d2:flake-update
c3d2:master
c3d2:gitea-actions-runner
c3d2:nixos-23.11
c3d2:ds-future
c3d2:container/radius

4 Commits
527cf48be8 ... 71ca8ebced

Author SHA1 Message Date
Astrobot 71ca8ebced flake.lock: Update 
Flake lock file updates:

• Updated input 'sops-nix':
    'github:Mic92/sops-nix/a929a011a09db735abc45a8a45d1ff7fdee62755' (2024-04-19)
  → 'github:Mic92/sops-nix/09f1bc8ba3277c0f052f7887ec92721501541938' (2024-04-21)
• Updated input 'zentralwerk':
    'git+https://gitea.c3d2.de/zentralwerk/network.git?ref=refs/heads/master&rev=54c215c3207858efb2cd349fc71b1a763b9cc467' (2024-04-19)
  → 'git+https://gitea.c3d2.de/zentralwerk/network.git?ref=refs/heads/master&rev=677268a3e328beede6067ff2caf3d443eddf8186' (2024-04-20)
• Added input 'zentralwerk/dns-nix':
    'github:NickCao/dns.nix/70dcce71560d4253f63812fa36dee994c81ae814' (2023-12-27)
• Added input 'zentralwerk/dns-nix/flake-utils':
    'github:numtide/flake-utils/5466c5bbece17adaab2d82fae80b46e807611bf3' (2021-02-28)
• Added input 'zentralwerk/dns-nix/nixpkgs':
    follows 'zentralwerk/nixpkgs'
 2024-04-21 10:00:54 +02:00
Sandro - fc76860cb8
mail: add roundcube 2024-04-20 21:11:06 +02:00
Sandro - 8c0b90451b
flake.lock: Update 
Flake lock file updates:

• Updated input 'simple-nixos-mailserver':
    'gitlab:SuperSandro2000/nixos-mailserver/4bc5bc9bdd0dd5816f24f286415f29e77a10b6e5' (2024-04-15)
  → 'gitlab:SuperSandro2000/nixos-mailserver/04490c0872d91da865b925a8b7f8ccd3ba982cbb' (2024-04-13)
• Updated input 'simple-nixos-mailserver/flake-compat':
    'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04)
  → 'github:edolstra/flake-compat/009399224d5e398d03b22badca40a37ac85412a1' (2022-11-17)
• Added input 'simple-nixos-mailserver/nixpkgs-23_05':
    'github:NixOS/nixpkgs/70bdadeb94ffc8806c0570eb5c2695ad29f0e421' (2024-01-03)
• Added input 'simple-nixos-mailserver/nixpkgs-23_11':
    'github:NixOS/nixpkgs/a77ab169a83a4175169d78684ddd2e54486ac651' (2024-01-24)
• Updated input 'simple-nixos-mailserver/utils':
    'github:numtide/flake-utils/d465f4819400de7c8d874d50b982301f28a84605' (2024-02-28)
  → 'github:numtide/flake-utils/5021eac20303a61fafe17224c087f5519baed54d' (2020-11-14)
• Removed input 'simple-nixos-mailserver/utils/systems'
 2024-04-20 20:50:08 +02:00
Sandro - ea116514da
flake.lock: Update 
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/d51114dc1bf3cfaba2b6644aabd16ff0c9909af5' (2024-04-15)
  → 'github:nix-community/disko/1efd500e9805a9efbce401ed5999006d397b9f11' (2024-04-18)
• Updated input 'microvm':
    'github:astro/microvm.nix/a1341f7195e34d9bb88c12314cc3b0c4429f9b0a' (2024-04-15)
  → 'github:astro/microvm.nix/6a4f822a817180be03fcdceb654088d002c9ec5e' (2024-04-18)
• Updated input 'naersk':
    'github:nix-community/naersk/aeb58d5e8faead8980a807c840232697982d47b9' (2023-10-27)
  → 'github:nix-community/naersk/c5037590290c6c7dae2e42e7da1e247e54ed2d49' (2024-04-19)
• Updated input 'nixos':
    'github:SuperSandro2000/nixpkgs/6d19e1faa9416bfa30e1ac5db381a186148bfa6d' (2024-04-17)
  → 'github:SuperSandro2000/nixpkgs/84f20dcf85434cd2e2a163ec3a30937c78cc26b2' (2024-04-20)
• Updated input 'nixos-hardware':
    'github:nixos/nixos-hardware/f2d364de6589f7a029624983593eafc3c4dac726' (2024-04-17)
  → 'github:nixos/nixos-hardware/5d48925b815fd202781bfae8fb6f45c07112fdb2' (2024-04-19)
• Updated input 'nixos-unstable':
    'github:SuperSandro2000/nixpkgs/b8f9c59a5967230a608704824b3f714644cf8e40' (2024-04-17)
  → 'github:SuperSandro2000/nixpkgs/d224d176823a02c7a1f89d473337becb353e50d5' (2024-04-20)
• Updated input 'openwrt-imagebuilder':
    'github:astro/nix-openwrt-imagebuilder/d8dc76f7f41c802f2f63c58dbcc77930b7c97eb9' (2024-04-17)
  → 'github:astro/nix-openwrt-imagebuilder/7ce60a34f86a0a9e35bcc69992de7d79e2ae863a' (2024-04-20)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/cc535d07cbcdd562bcca418e475c7b1959cefa4b' (2024-04-15)
  → 'github:Mic92/sops-nix/a929a011a09db735abc45a8a45d1ff7fdee62755' (2024-04-19)
• Updated input 'zentralwerk':
    'git+https://gitea.c3d2.de/zentralwerk/network.git?ref=refs/heads/master&rev=c277a38f5cd43f2abb84d6541149a800627fe869' (2024-04-17)
  → 'git+https://gitea.c3d2.de/zentralwerk/network.git?ref=refs/heads/master&rev=54c215c3207858efb2cd349fc71b1a763b9cc467' (2024-04-19)
 2024-04-20 19:54:36 +02:00
2 changed files with 122 additions and 59 deletions
Show Stats Expand all files Collapse all files

162
flake.lock
View File

@ -225,11 +225,11 @@
]
},
"locked": {
"lastModified": 1713204594,
"narHash": "sha256-5yyHYBWFZUKXkJvOccPBeX83hH2iED54NLnWs2eWgS0=",
"lastModified": 1713406758,
"narHash": "sha256-kwZvhmx+hSZvjzemKxsAqzEqWmXZS47VVwQhNrINORQ=",
"owner": "nix-community",
"repo": "disko",
"rev": "d51114dc1bf3cfaba2b6644aabd16ff0c9909af5",
"rev": "1efd500e9805a9efbce401ed5999006d397b9f11",
"type": "github"
},
"original": {
@ -238,6 +238,28 @@
"type": "github"
}
},
"dns-nix": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"zentralwerk",
"nixpkgs"
]
},
"locked": {
"lastModified": 1703643450,
"narHash": "sha256-EUUF5oxFFPX/etKm0FNQg+7MPHQlNjmM1XhNgyDf7A0=",
"owner": "NickCao",
"repo": "dns.nix",
"rev": "70dcce71560d4253f63812fa36dee994c81ae814",
"type": "github"
},
"original": {
"owner": "NickCao",
"repo": "dns.nix",
"type": "github"
}
},
"fenix": {
"inputs": {
"nixpkgs": [
@ -263,11 +285,11 @@
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"lastModified": 1668681692,
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
"type": "github"
},
"original": {
@ -294,6 +316,21 @@
"type": "github"
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1614513358,
"narHash": "sha256-LakhOx3S1dRjnh0b5Dg3mbZyH0ToC9I8Y2wKSkBaTzU=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5466c5bbece17adaab2d82fae80b46e807611bf3",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"heliwatch": {
"inputs": {
"fenix": [
@ -334,11 +371,11 @@
"spectrum": "spectrum"
},
"locked": {
"lastModified": 1713189110,
"narHash": "sha256-c/yG/AsPmMBMe4RAxn4KOkOaR4rsW5s3AjtfriOQKD8=",
"lastModified": 1713463636,
"narHash": "sha256-IPdnR0Rs7XoffnCn6rExYDlft/GHD/UFgQ11lTVEK48=",
"owner": "astro",
"repo": "microvm.nix",
"rev": "a1341f7195e34d9bb88c12314cc3b0c4429f9b0a",
"rev": "6a4f822a817180be03fcdceb654088d002c9ec5e",
"type": "github"
},
"original": {
@ -354,11 +391,11 @@
]
},
"locked": {
"lastModified": 1698420672,
"narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=",
"lastModified": 1713520724,
"narHash": "sha256-CO8MmVDmqZX2FovL75pu5BvwhW+Vugc7Q6ze7Hj8heI=",
"owner": "nix-community",
"repo": "naersk",
"rev": "aeb58d5e8faead8980a807c840232697982d47b9",
"rev": "c5037590290c6c7dae2e42e7da1e247e54ed2d49",
"type": "github"
},
"original": {
@ -395,11 +432,11 @@
},
"nixos": {
"locked": {
"lastModified": 1713390722,
"narHash": "sha256-qtpY1DEvG+fcod6X6awroFiWr5YrziX14DJDoBzAvfg=",
"lastModified": 1713634877,
"narHash": "sha256-+tmLKU8N+YMIIBRPmWFueaytsbSDu4wqGnxc3RKYZwk=",
"owner": "SuperSandro2000",
"repo": "nixpkgs",
"rev": "6d19e1faa9416bfa30e1ac5db381a186148bfa6d",
"rev": "84f20dcf85434cd2e2a163ec3a30937c78cc26b2",
"type": "github"
},
"original": {
@ -411,11 +448,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1713377320,
"narHash": "sha256-OrBm62B+X9jylr6cPgKc+5OSgF2PRW9IY0ARCOtURMY=",
"lastModified": 1713521961,
"narHash": "sha256-EwR8wW9AqJhSIY+0oxWRybUZ32BVKuZ9bjlRh8SJvQ8=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "f2d364de6589f7a029624983593eafc3c4dac726",
"rev": "5d48925b815fd202781bfae8fb6f45c07112fdb2",
"type": "github"
},
"original": {
@ -449,11 +486,11 @@
},
"nixos-unstable": {
"locked": {
"lastModified": 1713390347,
"narHash": "sha256-TWiUJ+lbNG87RDtVb5VGMdOzJQaL7GhWPFaGSc3GN8g=",
"lastModified": 1713624591,
"narHash": "sha256-gWudQexJmgAVzGnUIVzv7sJceAXnf1mz7dTL6zw/KJE=",
"owner": "SuperSandro2000",
"repo": "nixpkgs",
"rev": "b8f9c59a5967230a608704824b3f714644cf8e40",
"rev": "d224d176823a02c7a1f89d473337becb353e50d5",
"type": "github"
},
"original": {
@ -463,6 +500,36 @@
"type": "github"
}
},
"nixpkgs-23_05": {
"locked": {
"lastModified": 1704290814,
"narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-23.05",
"type": "indirect"
}
},
"nixpkgs-23_11": {
"locked": {
"lastModified": 1706098335,
"narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a77ab169a83a4175169d78684ddd2e54486ac651",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-23.11",
"type": "indirect"
}
},
"oparl-scraper": {
"flake": false,
"locked": {
@ -504,11 +571,11 @@
]
},
"locked": {
"lastModified": 1713351038,
"narHash": "sha256-0hoJWpoPMZ6Yyxtn6ISE9JWKh4b1rr/xMHTIKUQ1zgs=",
"lastModified": 1713607966,
"narHash": "sha256-8IfaENkpsGee7ZPPx/JmjX54gTMOs4z5C+8vFu/KyyI=",
"owner": "astro",
"repo": "nix-openwrt-imagebuilder",
"rev": "d8dc76f7f41c802f2f63c58dbcc77930b7c97eb9",
"rev": "7ce60a34f86a0a9e35bcc69992de7d79e2ae863a",
"type": "github"
},
"original": {
@ -619,14 +686,16 @@
"nixpkgs": [
"nixos"
],
"nixpkgs-23_05": "nixpkgs-23_05",
"nixpkgs-23_11": "nixpkgs-23_11",
"utils": "utils"
},
"locked": {
"lastModified": 1713201759,
"narHash": "sha256-HzgySE+n7Ri8faGo+uxYdjlCicgVGV0eJT86cWYIvo4=",
"lastModified": 1713017338,
"narHash": "sha256-BGXZdqdEc8+nFiX08q/kd8rWHgyiO42tacBpt39diMI=",
"owner": "SuperSandro2000",
"repo": "nixos-mailserver",
"rev": "4bc5bc9bdd0dd5816f24f286415f29e77a10b6e5",
"rev": "04490c0872d91da865b925a8b7f8ccd3ba982cbb",
"type": "gitlab"
},
"original": {
@ -672,11 +741,11 @@
]
},
"locked": {
"lastModified": 1713174909,
"narHash": "sha256-APoDs2GtzVrsE+Z9w72qpHzEtEDfuinWcNTN7zhwLxg=",
"lastModified": 1713668495,
"narHash": "sha256-4BvlfPfyUmB1U0r/oOF6jGEW/pG59c5yv6PJwgucTNM=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "cc535d07cbcdd562bcca418e475c7b1959cefa4b",
"rev": "09f1bc8ba3277c0f052f7887ec92721501541938",
"type": "github"
},
"original": {
@ -762,21 +831,6 @@
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"ticker": {
"inputs": {
"fenix": [
@ -849,15 +903,12 @@
}
},
"utils": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1709126324,
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
"lastModified": 1605370193,
"narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
"rev": "5021eac20303a61fafe17224c087f5519baed54d",
"type": "github"
},
"original": {
@ -888,6 +939,7 @@
},
"zentralwerk": {
"inputs": {
"dns-nix": "dns-nix",
"nixpkgs": [
"nixos"
],
@ -899,11 +951,11 @@
]
},
"locked": {
"lastModified": 1713381043,
"narHash": "sha256-KOLyVAbokvkD29kB/qqrBoD6Wkz/RXrRYKk5Fmll88U=",
"lastModified": 1713650706,
"narHash": "sha256-SlAm5TbgQcHBDe7QRFfg1yvk5uS4t6+QjStMP/59I1Q=",
"ref": "refs/heads/master",
"rev": "c277a38f5cd43f2abb84d6541149a800627fe869",
"revCount": 1989,
"rev": "677268a3e328beede6067ff2caf3d443eddf8186",
"revCount": 2012,
"type": "git",
"url": "https://gitea.c3d2.de/zentralwerk/network.git"
},

19
hosts/mail/default.nix
View File

@ -95,10 +95,6 @@
];
};
portunus.addToHosts = true;
postfix.mapFiles."valias" = lib.mkForce "/home/root/valias";
nginx = {
enable = true;
commonHttpConfig = /* nginx */ ''
@ -121,6 +117,21 @@
};
};
};
portunus.addToHosts = true;
postfix.mapFiles."valias" = lib.mkForce "/home/root/valias";
roundcube = {
enable = true;
hostName = config.mailserver.fqdn;
extraConfig = /* php */ ''
# starttls needed for authentication, so the fqdn required to match the certificate
$config['smtp_server'] = "tls://${config.mailserver.fqdn}";
$config['smtp_user'] = "%u";
$config['smtp_pass'] = "%p";
'';
};
};
sops = {