12 files changed, 230 insertions, 11 deletions
diff --git a/system/default.nix b/system/default.nix
index 17ed00bc..5faa402d 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -4,7 +4,7 @@
     ./disks
     ./font
     ./hardware
-    #./impermanence already at flake level imported
+    ./impermanence
     ./libvirtd
     ./locale
     ./network
@@ -13,6 +13,7 @@
     ./polkit
     ./power
     ./services
+    ./secrets
     ./sound
     ./tempfiles
     ./users # the position of this item is fully arbitrary
diff --git a/system/font/default.nix b/system/font/default.nix
index 484db7e7..3864b60e 100644
--- a/system/font/default.nix
+++ b/system/font/default.nix
@@ -1,7 +1,4 @@
-{
-  pkgs,
-  ...
-}: let
+{pkgs, ...}: let
   nerdFont = pkgs.nerdfonts.override {
     fonts = [
       "SourceCodePro"
diff --git a/system/secrets/default.nix b/system/secrets/default.nix
new file mode 100644
index 00000000..d1fc1714
--- /dev/null
+++ b/system/secrets/default.nix
@@ -0,0 +1,32 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  name = config.networking.hostName;
+in {
+  config = lib.mkIf config.soispha.secrets.enable {
+    age = {
+      secrets = {
+        nheko = {
+          file = ./nheko/conf. + name;
+          mode = "700";
+          owner = "soispha";
+          group = "users";
+        };
+        serverphoneCa = {
+          file = ./serverphone/ca.key;
+          mode = "700";
+          owner = "serverphone";
+          group = "serverphone";
+        };
+        serverphoneServer = {
+          file = ./serverphone/server.key;
+          mode = "700";
+          owner = "serverphone";
+          group = "serverphone";
+        };
+      };
+    };
+  };
+}
diff --git a/system/secrets/nheko/conf.apzu b/system/secrets/nheko/conf.apzu
new file mode 100644
index 00000000..a5437a95
--- /dev/null
+++ b/system/secrets/nheko/conf.apzu
@@ -0,0 +1,46 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlTTFEV1VUWGwzR1ZUWTky
+ZlR2aC9SVWNwM3UzZ3I5MWxXRXJ0Z3VlQURrClNtOUI5MC8zZzI3bENDZVdFblBF
+TWtHcmR0aytTQjAwYUJPWDJGeGNpUkkKLT4gc3NoLWVkMjU1MTkgN0hmRlV3IDd6
+TXJwVXkrRlVrYlN3TTAxeS9nN3hqK3g0TVdNSTZMeTFTYllGaUJMQ2MKT3pyVndS
+WjBqRXQzK3JYbWpBL1kzNEdMN0IzY1ZpZEhhNjBmMXRLTWY3NAotPiAvPDotZ3Jl
+YXNlCmZSYy84QndWWFkzNwotLS0gcjJ5Q1J5bnpoRlpCSElNMGFFU3FUL053aDlH
+Q3VzVWlPdlRPSC83ZWdsawqeZT1FZhjwJ2aVb0i4Dhozk/FdNxldZ1xG1C9rMMTt
+04ZYUADO0LAWfnloCuH0BWDfiNCTrI4aXiYD+aumufO3OBx43S+OCx9vlDq3RzWi
+Eusn9OkwzxVqh/ecHMLWaz+Z9qxdjDBYbDVY0jh+DdHLTswVP++yVXmNBVZ97YfB
+L0/Sw4lmrKRsMD+M8EFXwhE7w8KjyPnvL6cHSHDtd4eQpdMkOj5GhXP7ntR8NShF
+1oGAk7/z0T92h1WdzseSq8FJ8mHvzELx8AxYTsnsgEbyXOCA2J3nc/R4vqhHFgXA
+6+RH7jUmCQdQ1O9P5qH9pJlNjOr7TemTZSZocj51i6tI9iTxtlSYahjGC72WzLwt
+PlIkDTgVFJOApg7tReEijsUAwcemmZFu5YayZYnqv3DOGMBZGWDEWRmfZAtHpr+t
+rjcyQpAmz5IQ5XWiIIuuNzwzi60VdSnrmjiOFCm04mR1OwfqISJr3OInXK2h4RJg
+KuK6Nyyu+U8qF1K1VrfUwhVKdrYZQZD16OMNWGPaWcdfe8l9byJh0/UkHSNOXlv4
+cedD2/hnJOFl7n7p/V9jLEJn5oxIzxfVLuCQ/1dEg3nbvInpx/80NlqLTakdg9wE
+BiCQ+xpmGTZpPOct/OYKrEo0VIfkYZ16wsttncjAAStBzCiPhMEh/OIHmZrq8gVf
+6WUnOG07y9y/fWQeWVFQK1VkaCCKUe4i2ZPhWvLN4NLsoeUVHa5x3xZVZqKIZq7+
+ZKOAemgD9tGOnYkLP+om+MhJaj9oIlVPVcGn+NpzsmpQ1Duy7WT+3MN6c52343QE
+TawuB00PtYt7xGXikjXwU4df7iKwtGRHAgXyBeCyxcnbdPZzlq6IHPmNETg8Q0Qx
+JombpQ9hCRE58hcO7uOOij8ki1hrU7UHXpMIz7B9RMpMvFQC8rJBsEuYWIWa682x
+Px0jMWEHPtMGEcRI72ayz3a9ILtgaIHgpR4DGsvBmeJzUQbW909SeVSzgucrJee1
+4rUlZosyPF14/MmyawOJIJmXG6vQbIJFPqdl8lKRWjfOn08HD1RXLZ6izoK4aNK1
+xqyO4D1TRGooncMvZWnTDAufYjoar2N1CVtHdWT5bck3Siv8A4lLt0YF8tBjjVIM
+0Drk5BcfJy6dNi6Xn8koXsNHUctqFXy7VgPWLsN5I4aLO09bLRAaVN/5vhz2YEg0
+D1VP0AeclxBtDEyeN+q2CixNO4o0N/pF0Tv84Gh+pT68GArs8h6Rh7PnRtUg9H6f
+fHOp+/Ohwgv7RVa3+NHCrJvUn2i8MoJCBc/wbcye83JbPMRN/At3RxzjgiKivHJc
+0VOPZOk9rPJgs6PC8XAOwgSsoTS7gncAnDWEG3Bf8dJTyneRX7Tia/F2ygQ4qgZK
+Y2V3uZn+hsshVtQJIC16cob/qg0ZShMBVBjuqgI3GHZLCvIjWYBziYMvxb/n2rTV
+vxwuYfvbW3NLPXIlIy8OCpBnoFXCWgPaurMF0XMwbINCEYrAgcy9+OZPOGz+/K8p
+CJZxmPw9FiYBokZvrDr/zIIdMNOQp8PVjp2ZJU7WQyy3r5sH+uu/+tNfPw4bfYXL
+d/fu4bo0qwEgpGAkd/IcBHLMO+IY0WyNtn2INkPRLLMzmk32N38Y1dUL44nf7v0p
+y8TGd6bjkW+dlI483tCSdlNOlik4ko9ct/MX/mBIKXrueMhQV6mfh5TD8+IoAEk9
+ULGIanwIYyxWL+Wa3zTvJTc5Q6znoq2SpHyUBaCadrHL3vgLXDdpxwk7sKbiR+NH
+nJwzMMFc/cUHhR3HZIXx6JKxFlhqL7k788HzlYE3Cy1+nvL8JZdgSR1tEJtj2FbG
+ST7BaMBJyX64V8D02NAhgzDhzrdOlrLIlZt7JikK+csz3t7e+Nup32q31q1cbVXD
+MGuqojNtvCZQ0RcYUL/1EA3t6tSWWuNwAuG+uhrUX/EzMINKM02jrQhaH6Cu8hJw
+czzM+OLG8FRG76bXRPwKsByTAxhk86sMcI9pnL0TVKYg+ATRhZTWBk907WlkkBs1
+jbjtclvqR0tJKVZ+Qs36ftA2LEhFrL4ZdOcAwzgVKMf7Hh2qoZCTNZ+LEkf6lURs
+EFZdy7TN1uEQSje68k2V3Fc4/XOf69hBCqm5ZcSoOloCE2DlWBonOcF7qQCcMcEX
+aWopiL2S5j6trciTsP8Yhs1txC6wU7B+SKOOysKQ3/kdGJWU05Oo8TxCNsHNb24c
++UDBF+mbp0eNnnwHR3NzrYnbNq29hoQasICQ1yVejomQzO1UP1xP/nW8h8TaDIZ5
+5AWVCgygsamqpPKW2d+s6CdaNkCLwYUn9UPafbPmTxe+BA8sdJAAxxfKrSUCwF92
+rNvlwq1dPjzBOrnv
+-----END AGE ENCRYPTED FILE-----
diff --git a/system/secrets/nheko/conf.isimud b/system/secrets/nheko/conf.isimud
new file mode 100644
index 00000000..ef6c52b6
--- /dev/null
+++ b/system/secrets/nheko/conf.isimud
@@ -0,0 +1,47 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwa0Fvb0p0aU5yRGFCSm5h
+d1lNSWc3aWl1NS9FcXpsalVVVGpuZGNRMnlrClVBM2R3aXpSa3pjZFpQbEV0Njcv
+QUkySlJRNkV3THBjYUt3RWY3ZWRtaTgKLT4gc3NoLWVkMjU1MTkgN0hmRlV3IHda
+dUU2WEwxdjNIZ0R2Wi9rbFQyb1l1TlFBZUJMWlFuMXZNSWZaZFIza2MKVGwyOExv
+cW5GK0JsOFVRLzloaVUyQjhvYzR5QnNIc1RTaStISXdnT003ZwotPiBjejctZ3Jl
+YXNlIFR9UFRJZyAwTjpdfCBrXlc4TXVnCmlHWTBMOUhPWU4vTzV1ZWFZVTVzTTRC
+aitrNHJMQlBrMm85bWhBU29ONHpvSnkvSEFzcnZOTk5Ma1FNM20yVDUKMGF0M25C
+UzR5RDdrN3cKLS0tIFNUQk1jU05lSStkQXdYMkttYjY2UVczMi9xZkhZYkdIQWw1
+RkpIOTBvWncKIACBrSaYzKJ84Kjpj57B/WC2vjIvvDAfy3TF1gVEWFOUgYkCpO52
+4sjWpd3JVpdLzsJczS7Ty0HZYBlmz3Qtejf7x6b4xftJSari5WUK6loGtmGKbgJW
+lk2LZonpTsnyyALFavanlQKkv1isR9jqWxRe0KZu76zbX/QTUVfHyjV+4m6kleUI
+ZJj1mLUKxYdJn2aGyTr4kwTfbLYR8/xxJYGqPUmCrFrLhsr7qy/yBXvPyIfJ+sd/
+ab2/Qz2U8wE8d0JRiwoguFaRTbrIKBzliF84CrbDznJtLQjn02zbc78lzn4n/7MV
+3VArXkqw1pICkbrfLl1+own3Mw6ge73tDnSunzgJWBKSOFOrs/b/J1uMMjoiTGWi
+THy8+asIFw/zZTmrUnlfmm0gE20nm/HYTJ+428nGrMwdh++LqgocxqX+CNcNTT56
+QhXwR3JuliST8jptRaFo8fzoJUImclSj+o3X2/KORm4fS8u67lcDA6KB/lw6WOie
+UE09CVsrkR4X7ACe5Y7PYr0fWYNh1PrYxIabYttQq3aus5SunfkrCX+/+xtbMNsm
+FX0TxMintrp3UV4eWEZzsHNz18PaXtyZTFCF4sTmnxjfP7TelZRTHNh/LbKLFrqL
+kna9ChqIUiHIEYbugkZsSWUICWMbEGBWQxD4CT6DfGuve4vOgw5FWtqdvHz43f0j
+9Agjvab5H+fBvDJTbJiHOFn681Wl219hR4z1plM1eVu+59JIFECVeEePoDrjGy9n
+K50HUNs5Vq0p8RFus2BbjTuECmggkzd0P7mZb34bVo6K/89lCny21WeGyhwim8Hr
+KKBmpm+hCh7gikBKXP0tnpmt4A5sPg30+YxePgaKCNtUjLLnN4moEGzzAsks1qsJ
+GYvzSZv7AmTfyww2cjVm9ZSrlo4EHL5dMPEVBHpy6pcSV6WotkZiDklYPD4g0ZO2
+wgbLU5/YDhve9FOKoP7Y4wocP18O6ffjiPVeCg9XDUmoKq5Y/Ea1d317q973G2hf
+YxUD8z9I8+fGlfqmgIjJZx8/0wTFlrCxI1oam6xPDmbSjrdVI+nr/2lfNqy/VOYN
+SQMr/Po7DcAwB5SS4ItxYXKYo9FAFyoHAljYhV156l7dveqehZDKaqBzBF+pCefQ
+BfiwvYg3by/R9jtMdh6MwfMeF1Z0siJdrPouIKmsuITLexuj85GkzPzSPDa69H2s
+iInDepGDX2YvH2BUsUi8QPwoxRXROFwDqaIpA/aaPf224YN7D46TzU+a2HQzlpmV
+xWqh/pBEwKdTpbgtdoG9GLrETDD5/2FV9FiQXxQgvV8934nlOAvdwHEJqGMlNIT2
+mlNhZyx49lOfx8BFP+NXb2adUY49Aahkdx4/uB6fN0H/RyNh39R74DCbjvIQUxRV
+OUKyWZ2a2wSbZbA6tNmB5sXYtfCUOZLfE8mUwJgUSVrEccQ7UlSlEy9+gZDiHjS+
+OYnTBdRdG2AjPy3mBAdfqooTdzQwT5HNnFskg7Q3wnWRf230yZ6Qr2lBOyBgtnm1
+Hj8fI9VrACfAtYMIWUarBAnnoWHB1pHfoZOui6Zr4jtqlH7lgOAUFx/b60g4SsSF
+jAJnRCFyUYbTv53GefabjkDg3WkCiyxrNhr7gS7oONa1qHai/1TQeWPCe9zj9kaR
+nMRZQKI1/wmK8szhH7sA+tShtM3ktqkNlIWXuwId3OJ8ne2vcES92NRfyUI8qY39
+atndXRUg47+2MubBZhP1pnLEdxpvdOQVgDIzoNx3mu0mWkSi2K3Dy/Y4mZGVaee/
+K98cPo3S42eKEulsN/iyTWD1nJpaDNp4fWDCDMSK8dy7vSWYcT3htzzR3a4WIlLk
+PV3/7l99y/HLjlJmqUwRri1hydRdC74Lk3FSV6gc6snn54WnaLUCVOpCIgHefNVr
+zYmUR+4I6zioxp9540zrD8YvrK8YSSs47PtbpDYI8E9O4L7+uy7gujwJtSupZVRc
+BP48+5NddK3gpQt4BagYj6CO/vENwDmUiA+kUM9WdQbnV/lmeNPdqm2VjVbxNObZ
+5xHlXODOOCVg+LSpFybFT+3A2MNA/jRKGID5Kai0a9c7jY/XIrUdIaCpyVylj2dX
+4JDC6AsRb1VXu7FaqhLhOabZZzW+o8m94ZjayWA2BT3IMf5Kd6eq+v9zh5RPlvtu
+vcoLBTEsLPZeAyERpaTto431yRqzSKMvDQ6nwpXbdIcHLIvbp+utRoaqtel2JGO4
+PBz21qEI/ACc6sDhyUHHLz+MybEQilTSrBJ+jYSohFfm0DEpG8cThgm6mMSDUMEM
+6ehgKHIYdlMa7YIBcIpJBsl8Xs6If2+FA7cbeh6xqbw=
+-----END AGE ENCRYPTED FILE-----
diff --git a/system/secrets/nheko/conf.tiamat b/system/secrets/nheko/conf.tiamat
new file mode 100644
index 00000000..51cab7df
--- /dev/null
+++ b/system/secrets/nheko/conf.tiamat
@@ -0,0 +1,45 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCUDQ4ZUtkcEVTVWpTQ0Zy
+Yi9naWRDaDJFYm9GR0k1QVhJR3V2Rmc0a2hNClNxeTQ2YmFHRkxRWnhlc3IrKzJE
+eHpWNGFSTEV2WDR0OHNwTEZiMGdxOFEKLT4gc3NoLWVkMjU1MTkgelpFb25nIDFH
+M3orVXZFMndGc0hPN1hWY0xyeXJuYmFLVks4bFVqdHFQVEN5eUhNRmcKUWlZdjlH
+ZWtrcGlnZ2ZGVHBwNEZrM29CT3c0MERBNm5SVjhMdWxGbEgvbwotPiBULWdyZWFz
+ZSBoOGYKdzBOVGpYNVJFdXoxK1dZdU9rdG5jU21UbUp4UjJYZXRoTTJqNnJvCi0t
+LSBwZTJaUS9XRVRINmpNVFhxMnkvdGxkVTJaNkZTZG1PUGVZN0F5QmpJWkxrCohN
+YfE5W/OxshJPerGCFWpYkFcQhJaz/HEknz13rCqH4yXfp3M7uoHWKfEFi1uzFdZs
+H9MnIKS5NN8bLW4xssBaogalqCAigEUDuLPKmep8224Y4h9i+7fWOMBhgHjU322N
+7iJCjnHiKT2tM4uv95c9Fa676xHcfZwzaCFDxbasQZmZL3G3U1wDseSK7EHCZ78R
+sXqqd54ApUQyAwdSLPFVvX/YlhOIL6MMUWvhmmgHcNRYa71cQcoojleJI28fu53w
+6X0qez81+/D8txyCEtF07m7ckCtYTe7oKT+mF5cvT99lHqEJBJzq/PxUIQt2dA2y
+AQr09/7LJ5h8RYVG8emwlqzBasvCdLFXwtCNRMQGb5kDJ5CcZKy50SIpYvDdj269
+Ap4Lq/luQIeOMXQudbc+ECToxbrRKy4gcG8oKsvIXytIOszA8x4WjR14zSBTNunx
+Z4mOb0zDy1GdKWsgPcyYdiOBIKzEpTLvjCbWYWJunGSPIlsksBvAAP6MsCbV0WQo
+brp48ds24jlCjtqW+AdSIvo5+YVdyCEho8Gdw7k134cIhjoC0SU1vmNNzh1swoW0
+yRKG8ql2Tj6myIDcLM/KDozsgu/gNC2ugRwTCDv+gcApZBmKUXN2w0abhI2UMksH
+FEw2ITrWDhPE87bXWNua+vdaBa619lg43xoJTGeJHqF5gXEV3blZ5bTvVjT2H7Dy
+uBfCk+XQ4G51Dwh5iyjrQyWxCkYS0FJGD6WUTBU0nrxc6d9UERcxVurtPr7I9Tmf
+IVdl6jkrjpfVIL/Imo+YgfdG9CvhyEl/x50c4umDsLxEi67v8TE/yEBhY+o5RnKD
+EU0NjdHDIgtI9+Fa0KujnkIN6DqJ0V+QHKv7K8yiR8BScIq2YD1LOOApb6pom7+4
+440vZwmo4NgPsPyM/GgGUIyTeR4tU42BPyMTPjKEuN97ZwWZqIFreUl+nyLzViK/
+bGLYcRfVjjHTJPIeZRosYUo0ZMFggXAuslx5trQcb1B4iHvL7k2jjnMRJmyYZX2d
+CWohscc+7+1iFNdH++tefcED8T8HCGpM1RxSM31kfpnKnINeBdo9E9ZDmNCElZm+
+nds5fgTm/MLKsuC/t+MecVdfeHTufc/Akh343DMdIMNmZ35xLcpNLmxTJ+iCALS7
+nheIWAFUaTh6GB6IGocSSjQ0RwS0wIftka4QdW+UEtEjnvB0D/CjwDLSO3pUl0mj
+44r8fH8IZVcQcnqhuEsFoih/XOlH3N95O0HxXCvUcI13/HaSpUKdJqyAIn8w/jBM
+FL/boJVA1zOH5sIY0AD2IMavuS5b/ZgJtPsESrc0LUiL4nztDVdAEtpHUM0OEzb9
+tSAIN888UKTC8MFSIwA+4cXIyCEpxXP3HbSNaar5gp75oG5/BqOu1aF5sC0kKpmn
+9C9+z9sLTDigzV1GKlPpUGd9lVOeH2JpAY8ZUyn2gxh7C6IHwwUbWUclEPy2siYd
+HcAMneEwXpm6DfJevMi2o0wOdVakcpN+YUNzIgferM/IU5FbgtC8gNBpDCBo2yLe
+X7ERSzP177QWwXLIF2WhZeG4Cvszj4tySYsRJhoZPc9jpRjiK/ccOoNo8A1UKbJC
+H/836MNskBmmbNoPsS979mLv8ijpRzvjnwbWn+ZlCo3gZAKVM7PcXuTODcWfoAJ4
+2ugEHCAiOobGQtGUp5HOhXYfAK2Wene0a9RmSAT3SgPmx95u1Fy8n+m/PDK2opIe
+REpj9UTcoT0+5aHIwp2gqLVpQH2953Prd0qaNfc1t6gQKwDXDDU+b+QmxAaPBwpu
+0TEIEYKsx237lX314XSaq+Nt7Ko1OPABR4gkz/ELL4WOKwFbf7oAAV3UiNPwweY8
+R3cpVvQ70y+M2Nnwepxf7wSruo+FDtgsic9vtobdpwBViPC+AG2QbI1hTD3uhslE
+KunFtbO08ARcTMeMgZ0BE3XXnrgxdKjXmPEybQiyObFxDGbV1EX/2i1MKArQdQzs
+MxCpKOzDi5axr3Qd/W6Y/foMZWfRYgb+0xITHU7haR8QRD80uTbt9TfsqK98H1A1
+UMosMKhkzKG70qdNvTiEh+OqBAIbUL42IKNn4SCiZt7ZCQ6/QqwcCi6ND0w8+dO1
+u8vZdRF+r/3AAPpa3W7BiIiLUmmU8IUI8A/72cCrY6PyrjaomXnpVWlZjQ616i9Q
+TU9IwBahMa2j/a4317pv/7ltQQCpCkRs/HweQy5CQS+yFuOcoOVikL0ZHd9XC4YX
+QJ/T6R5+OngxkJgoPRtJ
+-----END AGE ENCRYPTED FILE-----
diff --git a/system/secrets/secrets.nix b/system/secrets/secrets.nix
new file mode 100644
index 00000000..36757546
--- /dev/null
+++ b/system/secrets/secrets.nix
@@ -0,0 +1,15 @@
+let
+  soispha = "age1mshh4ynzhhzhff25tqwkg4j054g3xwrfznh98ycchludj9wjj48qn2uffn";
+
+  tiamat = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMD87QQIUXdEv3TaNRrI9clD9VgpsuVLFg2CrNGa5lVB";
+  apzu = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBivF5b6PyxsR/t+4Qg4IEDXHVXrjmZpslTUNXpvcVbO";
+in {
+  "nheko/conf.tiamat".publicKeys = [soispha tiamat];
+  "nheko/conf.apzu".publicKeys = [soispha apzu];
+
+  # only here to satisfy the nix evaluation
+  "nheko/conf.isimud".publicKeys = [soispha];
+
+  "serverphone/ca.key".publicKeys = [soispha tiamat apzu];
+  "serverphone/server.key".publicKeys = [soispha tiamat apzu];
+}
diff --git a/system/secrets/serverphone/ca.key b/system/secrets/serverphone/ca.key
new file mode 100644
index 00000000..d49c5395
--- /dev/null
+++ b/system/secrets/serverphone/ca.key
@@ -0,0 +1,19 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyaGJNQkRRVy9MRXZ3b2tJ
+Q2R1NUcrYUNGRE5uQkNyUDdkSm5rUWYxaXpjCjduMG1FSG1VamozdnJoVFFZUDYz
+T2pyK1k3ekZ4RnFMaDFKdUZPWVNuR3MKLT4gc3NoLWVkMjU1MTkgelpFb25nIEpP
+d0xwS3Nia3AwNmppRjZhODdzNXhEcnRsZW5rUzBQcTN6NWhWeTNiQ0EKTkpUZ1Jk
+NHE3WVRzVEhpMnJGaVFpdkFBVW5QNThCSUdFSHVQR1RrQUJsZwotPiBzc2gtZWQy
+NTUxOSA3SGZGVXcgdjJKUUtlRjE5UFEyR2tBOWhEbHNMVlNSOUMyZ1dkYkhYZWRW
+by9QZ2UxTQpVSnhJcFFYay9LSStrSFFJcXJPWUxydXNGbUNXRVpLcHJibjM2TDlw
+RnlVCi0+IGNHPjMiSyQtZ3JlYXNlIGcgdWZkbApmY0YzMmhDdzBWT0RKaWlUUmZP
+bmRPOExuRVJ3Yk5mMFhYSnhlRENqWXJxK1VWdnBibUxzNWV1NHMyNVNXN054CmR0
+VFAzYUR0RHVaZUpOTlB3USt2TXVDcXdLOGtpZwotLS0gaTliQzBjbjdUYkVidURX
+em9wcU04cDhNMHB6KzNBSVMyMmtSRERKS240SQryB70ZEgDQ4eJ/pjIWh6MBEUQr
+iAx2i+J+XJu+74bC9DfB5rWpR4/HAdp8EF6wmi05TuEPUpG9brwm/mHi+FB/Drpu
+00viGfM3dlCyALz1jB2W/MbruouK85o2L3RWDCgc+eT1gA+u2C7ZxO6iYA3aP4lu
+ShDcSHlsKkh9lx4cRsNTua/8N+GQZLciSC7iMDroruxWj1HET9IxeeVN+VSuqcjW
+ocX3LU2uU8vP9WT9zT1lbQB5Z0EM7W+ez61SjGpzrpXB2mpmi+SHOIWF3VdG1H8R
+18BIyRjKIj5Op+8XD7qAe6nl9SSCnMURH+arc7yjNMgEbzFykfldfug2ibI2G/kW
+OxeiEBoSFlC+V8ivS6I=
+-----END AGE ENCRYPTED FILE-----
diff --git a/system/secrets/serverphone/server.key b/system/secrets/serverphone/server.key
new file mode 100644
index 00000000..a2720406
--- /dev/null
+++ b/system/secrets/serverphone/server.key
@@ -0,0 +1,19 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJZnBXSzF4K0ljR3B1Rkk1
+M0lSSkVmVlA2Tjcrd0JCRmhHWDY4bzNoYnhjCmsvQjJmYU5vNVh1Umw0dzhCQjNF
+WVRhVHpUTUIzRVBxaXhFWHpuenZHN0kKLT4gc3NoLWVkMjU1MTkgelpFb25nIHAz
+aG02dkxiNVRreVNadXJjbnc0bXBtSFRSNDhrYjljanUrNldwVFlabXcKU2c2L25r
+VlNjeDFENUdQeWllenRGWlRqRW53UU5VNEdCaUZsbHpaL1ZFTQotPiBzc2gtZWQy
+NTUxOSA3SGZGVXcgZytvUUhZSXhwQ01mQmtkZmhzdHJUd2tlQS9yYkxCdTBYZ2pJ
+UEd4WEF4SQp4WVh2UEJReDVES2tCWlpqQS9aanQzRGRsSTA4S0VXSWZxZ2hoKzZq
+YllzCi0+IEc4eC1ncmVhc2UgaGQhIGFydERoaS4gLERUcQprczdDdHhaOXpmN1VU
+MDlHNlYzVmMxY09Oa2xzTVN6M0ZyYnpRSzJEMS9nMmlqRVo4Wk1qN1lKZnp0N0RT
+UStuCm51L01Rb3ZxNUhEa0c5Z3orYlp0YmlXMkhpeHVJMjNkRFZYWmR3QmV2Zwot
+LS0gdWJDeHZvc0xOMU9uUjUyMlRGUnlGSW9PZzVKWWNoa3pWbVM1OE9LdFk2NAo+
+WS82jL1us5iVw+xWVI80luHMs31hxZfQgJDBuFbtpY0nKkM97U7rusl6t8P+s93c
+R0IYBEUuz6n33GTeVOLipDqkZftlOOvSZkFneZ766+GpEO01dCjeSW9KViDC1jI/
+721IXq9TQNZw0Ou3Vf5E0nDypsfG0UhEoLCy6QZL9YCIyl5s//kyFFnpQjyaGT/P
+pRHGhD0BxZa2ib07WDWzBpsTFtVemwcn9lqAx7DlYV2X3UwCT3qVOVjDuA/j6qUt
+8bCDoXs4/dWleHNHzpwRhe+j2W4OWDKp7o0zYqxkUuPpEWXL7+A+B/+/08nAtZQk
+ZvJyaZSL5wicIPAjLxrD00z2QcE/ZPyUrXsi0gOovuk=
+-----END AGE ENCRYPTED FILE-----
diff --git a/system/services/nix/default.nix b/system/services/nix/default.nix
index 1477be1b..491b6a4d 100644
--- a/system/services/nix/default.nix
+++ b/system/services/nix/default.nix
@@ -1,12 +1,10 @@
 {
-  config,
-  lib,
   pkgs,
-  nixpkgs-as-input,
+  nixpkgs_as_input,
   templates,
   ...
 }: let
-  nixpkgs = nixpkgs-as-input;
+  nixpkgs = nixpkgs_as_input;
 in {
   nix = {
     package = pkgs.nixStable;
diff --git a/system/services/serverphone/keys/key_1 b/system/services/serverphone/keys/key_1
index a3496d00..67720882 120000
--- a/system/services/serverphone/keys/key_1
+++ b/system/services/serverphone/keys/key_1
@@ -1 +1 @@
-../../../../home-manager/config/gpg/keys/key_1
\ No newline at end of file
+../../../../home-manager/soispha/config/gpg/keys/key_1
\ No newline at end of file
diff --git a/system/services/serverphone/keys/key_2 b/system/services/serverphone/keys/key_2
index ff3dd5b6..24df7207 120000
--- a/system/services/serverphone/keys/key_2
+++ b/system/services/serverphone/keys/key_2
@@ -1 +1 @@
-../../../../home-manager/config/gpg/keys/key_2
\ No newline at end of file
+../../../../home-manager/soispha/config/gpg/keys/key_2
\ No newline at end of file