reorganize config structure

sys/default.nix

@@ -57,7 +57,7 @@ with lib;
       group = "fabian";
       shell = pkgs.zsh;
       extraGroups = [ "users" "wheel" "networkmanager" "dialout" "libvirtd" ];
-      openssh.authorizedKeys.keyFiles = [ ./fabian.pub ];
+      openssh.authorizedKeys.keyFiles = [ "${flakes.self}/pki/fabian.pub" ];
     };
     groups.fabian.gid = 1000;
   };

sys/fabian.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHkK2Cg3dozG78AEA2OTzydezcKVnNTTj0MUJZcP/mrN fabian@posixlycorrect.com

sys/home/cli.nix

@@ -9,7 +9,7 @@ with lib;
     git = {
       enable = true;
       userEmail = "fabian@posixlycorrect.com";
-      userName = "fabianmv";
+      userName = "fabian";
     };
     neovim.enable = true;
   };

sys/home/default.nix

@@ -3,7 +3,7 @@ with lib;
 {
 
   imports = [
-    ./lib
+    ./cli.nix
   ];
 
   home = {

sys/home/lib/default.nix

@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./cli.nix
-  ];
-}

sys/srv/default.nix

@@ -2,6 +2,15 @@
 with lib;
 {
   imports = [
-    ./lib
+    ./net.nix
+    ./mediawiki.nix
+    ./jitsi.nix
+    ./matrix.nix
+    ./forgejo.nix
+    ./vaultwarden.nix
+    ./bepasty.nix
+    ./jellyfin.nix
+    ./msmtp.nix
+    ./kuma.nix
   ];
 }

sys/srv/gatekeeper_ca.pem

@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDijCCAnKgAwIBAgIUQCBAoFSQrYx063PnK3XKiOJSpvQwDQYJKoZIhvcNAQEL
-BQAwKzEpMCcGA1UEAwwgcG9zaXhseWNvcnJlY3QuY29tIGdhdGVrZWVwZXIgQ0Ew
-HhcNMjQwODAyMDcxNzE4WhcNMzQwNzMxMDcxNzE4WjArMSkwJwYDVQQDDCBwb3Np
-eGx5Y29ycmVjdC5jb20gZ2F0ZWtlZXBlciBDQTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKxjqIpRxIu2yPejUbyMixZACESrbmIGOhhxwUu1ys6aYPOZ
-7yQMs5xuJXcgCuD7Oba1eBi+CpLhyvgZlyLrCfxoCzTdAeeXq0EB7YUn8IYEN3dR
-e+yds//zkjRzbXAaIbUoAF8XaXgylOSIXLNrh0TTjNscC+TPYvKSbaDhdICOZ1ky
-u08w5QdOoi1W8FNJd4LKIKWQZW3dMeNaBbKnt9R4mjL28tE5gP6ZYUvcCIoqYAbE
-DSNq29lXsmDzbD914bN5wYoTP3A+k8QG6eYGb10YgaaJ0TBxeLzadVBq7gFylMt3
-1LTNmH/v+l73IYfiDV4O3d33cg0VOKqiD48WCnkCAwEAAaOBpTCBojAMBgNVHRME
-BTADAQH/MB0GA1UdDgQWBBStVj4YoMTnD+XZ+doBI7Ao17Gg3DBmBgNVHSMEXzBd
-gBStVj4YoMTnD+XZ+doBI7Ao17Gg3KEvpC0wKzEpMCcGA1UEAwwgcG9zaXhseWNv
-cnJlY3QuY29tIGdhdGVrZWVwZXIgQ0GCFEAgQKBUkK2MdOtz5yt1yojiUqb0MAsG
-A1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAZgbpPdkhAbrbA7Y63WI2Bo26
-tPVCZpsEKiwpyEbDDC+NVrbOit1kQg/j26RuXLDVg19IfXk407FVFVGYVJNE+kXt
-KjyKCGyyZUBQRebCN8kzFsCQ/AJSfzNKQhEK68rchSH66mbjtOtItkdVZRnq0pWI
-7WXlTIxK8KTcAx2V/ijyalCENUpwRWfM4Qnkqsi82Dx9e8V0TRCLomW7IQok4dre
-F6IolUHw9ZuSC10/T8n8+riqWBWEisBGLz79OrdETdHK9A5gpNHRF+sO9JAhVr/t
-exBWTEJ33BeI0NX87d0Pneun4nss5FsLst+Ut7Y0F2QF2Iar1iERUalHVIjCtA==
------END CERTIFICATE-----

sys/srv/jitsi.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, pkgs, flakes, ... }:
 with lib;
 {
 
@@ -14,8 +14,7 @@ with lib;
         
             ssl_verify_depth 1;
             ssl_verify_client on;
-            ssl_client_certificate ${../gatekeeper_ca.pem};
-
+            ssl_client_certificate ${flakes.self}/pki/gatekeeper_ca.pem;
             if ($ssl_client_verify != "SUCCESS") {
               return 403;
             }

sys/srv/lib/default.nix

@@ -1,14 +0,0 @@
-{
-  imports = [
-    ./net.nix
-    ./mediawiki.nix
-    ./jitsi.nix
-    ./matrix.nix
-    ./forgejo.nix
-    ./vaultwarden.nix
-    ./bepasty.nix
-    ./jellyfin.nix
-    ./msmtp.nix
-    ./kuma.nix
-  ];
-}