From 94647074cf5550546711fd7eb7919bf2884f9237 Mon Sep 17 00:00:00 2001 From: Philipp Hochkamp Date: Mon, 31 Oct 2022 05:34:56 +0100 Subject: [PATCH] add mailmover --- flake.lock | 57 ++++++++++++++++++++++++++------------ flake.nix | 4 +++ hosts/picard/default.nix | 5 ++++ secrets/mailmoverConf.age | Bin 0 -> 1043 bytes secrets/secrets.nix | 1 + 5 files changed, 49 insertions(+), 18 deletions(-) create mode 100644 secrets/mailmoverConf.age diff --git a/flake.lock b/flake.lock index 90a8ab37..89fffbed 100644 --- a/flake.lock +++ b/flake.lock @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1667073293, - "narHash": "sha256-dXB0vo7MfwxttoOz0X7w4oLoABs+3HQc0xcC3IAPJYs=", + "lastModified": 1667160042, + "narHash": "sha256-Gck+WbnlVe8JZf90NTqCXc5NGPIuIu2AyJUaXghpQxw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d078c99b943d96fdffe831dfb9ea1cbfca57a357", + "rev": "d53959356bf17656f82d90ab5d7346fb3107896f", "type": "github" }, "original": { @@ -81,11 +81,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667077288, + "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", "type": "github" }, "original": { @@ -133,11 +133,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1666741416, - "narHash": "sha256-+df1MqdPzT8GaHWdW7ce4Hxh1TdNOZDQwBq1rZLxowc=", + "lastModified": 1667160126, + "narHash": "sha256-YRgxMHdvMuLsuXCaKs5YNMD6NKgvcATSjfi9YkUOOLk=", "owner": "NixOS", "repo": "mobile-nixos", - "rev": "7f816a87a5c14d6bfe6400db9c7f45755ab7822a", + "rev": "da56c338a2b00c868697b75bdbd388f60d50c820", "type": "github" }, "original": { @@ -185,11 +185,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1666959691, - "narHash": "sha256-TRpWA3t8ata79HOGtFd5dDCl1kJQmIE16PDF53/Hcxo=", + "lastModified": 1667050928, + "narHash": "sha256-xOn0ZgjImIyeecEsrjxuvlW7IW5genTwvvnDQRFncB8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "448a599c49978c2794401bfc3a2e1fba1a8663be", + "rev": "fdebb81f45a1ba2c4afca5fd9f526e1653ad0949", "type": "github" }, "original": { @@ -201,11 +201,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1667076996, - "narHash": "sha256-qU0Wwey2+Bp9fxjcetPzIXGNKJWHaNHrZOTPSrMSUzg=", + "lastModified": 1667190866, + "narHash": "sha256-7mi4ogGiHwYGAej9dzCeIAbmNkRB+RYbkwu3pKymLCw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3fc1cf0d0f29211ddc0c3c46437c753cb68d16c5", + "rev": "5f6c2aa9a4481e757b02f5b22f51e722cadf5a19", "type": "github" }, "original": { @@ -319,6 +319,7 @@ "pandoc-latex-template": "pandoc-latex-template", "rnix-lsp": "rnix-lsp", "utils": "utils_3", + "x": "x", "xynoblog": "xynoblog", "zsh-completions": "zsh-completions", "zsh-syntax-highlighting": "zsh-syntax-highlighting", @@ -357,11 +358,11 @@ }, "utils_3": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667077288, + "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", "type": "github" }, "original": { @@ -370,6 +371,26 @@ "type": "github" } }, + "x": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1667192578, + "narHash": "sha256-wuF42zbB0ICp0J16lesb8pBRW6xDOKfUgDAVk7gwNsY=", + "owner": "thexyno", + "repo": "x", + "rev": "c0dc6b924225a5e4ccfa76e15a2a7fe613badbb7", + "type": "github" + }, + "original": { + "owner": "thexyno", + "repo": "x", + "type": "github" + } + }, "xynoblog": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 149d4c8b..84ebdf81 100644 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,8 @@ #impermanence.inputs.nixpkgs.follows = "nixpkgs"; xynoblog.url = "github:thexyno/blog"; xynoblog.inputs.nixpkgs.follows = "nixpkgs"; + x.url = "github:thexyno/x"; + x.inputs.nixpkgs.follows = "nixpkgs"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; darwin.url = "github:lnl7/nix-darwin/master"; darwin.inputs.nixpkgs.follows = "nixpkgs"; @@ -64,6 +66,7 @@ , utils , emacs-overlay , xynoblog + , x , ... }: let @@ -105,6 +108,7 @@ impermanence.nixosModules.impermanence home-manager.nixosModules.home-manager xynoblog.nixosModule + x.nixosModule ({ config, ... }: lib.mkMerge [{ _module.args = { inherit inputs; }; nixpkgs.pkgs = pkgs; diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index ff470453..51c4d9cf 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -115,6 +115,11 @@ ]; services.xynoblog.enable = true; programs.mosh.enable = true; + ragon.agenix.secrets."mailmoverConf" = { }; + services.mailmover = { + enable = true; + configFile = config.age.secrets.mailmoverConf.path; + }; ragon = { cli.enable = true; user.enable = true; diff --git a/secrets/mailmoverConf.age b/secrets/mailmoverConf.age new file mode 100644 index 0000000000000000000000000000000000000000..f6fda9426f5d97566678086e8b3b3cdf13073851 GIT binary patch literal 1043 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Pfqpr4^;5-52+~A zH%oM_%rti^3J49$_e%5$a0yRy$~V!^_HnLqPxJE+@wUjTOy+X;G;_+$aW8gC5A$|1 zun0&Cw)Bb&PRw`r%PBOEtS|@(Pxp&Vi!AmrG(fklG~FXSyj&qAB+oc7C@`WbAT1)u z(knt+KgFXsINjC5G1xK9z|y74Kcvdv(BC&QB%dqOJITDHG)TKV(yt=P(#XWCtT@** zv?Qw{Dj>TgyU4}GtlTX*sW8jJKO5b)&``^uU`K`2jKt!coFe1w+`?dkfRfO%vb-XH z^F$Xn{VMZR=X~d6$I#sTH0LZ!4+Ad!(8vrw7x&PTGG}k+War$fs53e61kGsE1SBl9b>Bh5n-eNzLq z3o3mKor?8M-LhN*LPEK`ll%V(M>N(O)O63N;gQ(_s{h*H+C`(35!e*4a*B~@pjL5OAM$m4{;B1 zcg--!F?RH=j3_e-(RK^2Omoi8$g}Wtt#D1s%=Zm4faCLR| z3oNrV%gZ#ZO7n@z^b7R#@D8j<_b*B>3(qr5_Hv0x(+?@lGjVj~+AVWft2{HqGx)sM z?Ry7Xi=Iz7zg&Hdve4ccY}=2l{br}ka)LeLk8Sfti^jBzo!i$o2s$mPUo3rO<8(%= zxD938pNj;|z65g5Z-s}hFl%y^4-&a$iw(P`r9`WrmJ5DWl zn0vi)?qv?G1+OoC-s4z3Whv`Fjo2^3KZBn?JhtwLPp#d>h^=>tBFVb)^q$5);ha)FVD14Va~?((j6{k|J(Kd*_;iI;vDAR6~G&e`;ey`msXnDeYo#`*ixo}S(Faetph_~8wE zSQzvsb~xP)`{Poe|5QC=kxPGW*(}Y)Z!S!Dw|wgfSwABmWqwbVtB-ypiT>=rqS&{4 zR+reGtL6`!-%pt0TvL&;_qOA#W6Qoh6x;A!^vDCd%!U`Ot9FGOI!p21d>>=;LfSKC z)6d<%=ha9o4-({E+q_`^vI)Ff%Y|yilveVVtTsB^U(w*+@9}q`#i!5Zb^FyX734iO qWnkFqEunMmqRaNr>%7(*MZe7gx-WihJ9$B7Udzjb{J=f1Wx3 literal 0 HcmV?d00001 diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 66c1df64..9fa6db24 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -15,6 +15,7 @@ in "photoprismEnv.age".publicKeys = pubkeys.ragon.host "ds9"; "ds9OffsiteBackupSSH.age".publicKeys = pubkeys.ragon.host "ds9"; "hedgedocSecret.age".publicKeys = pubkeys.ragon.host "picard"; + "mailmoverConf.age".publicKeys = pubkeys.ragon.host "picard"; "matrixSecrets.age".publicKeys = pubkeys.ragon.host "picard"; "gitlabInitialRootPassword.age".publicKeys = pubkeys.ragon.host "picard"; "gitlabSecretFile.age".publicKeys = pubkeys.ragon.host "picard";