flake.nix

@@ -28,24 +28,24 @@
     };
   };
 
-  outputs = flakes @ {
+  outputs =
-    self,
+    flakes@{ self
-    nixpkgs,
+    , nixpkgs
-    unstable,
+    , unstable
-    home-manager,
+    , home-manager
-    impermanence,
+    , impermanence
-    flake-utils,
+    , flake-utils
-    vpsadminos,
+    , vpsadminos
-    homepage,
+    , homepage
-    conduwuit,
+    , conduwuit
-    mediawikiSkinCitizen,
+    , mediawikiSkinCitizen
-  }: let
+    }:
+    let
       system = "x86_64-linux";
 
       pkgs = importPkgs nixpkgs;
 
-    importPkgs = flake:
+      importPkgs = flake: import flake {
-      import flake {
         inherit system;
 
         config = import ./pkgs/config nixpkgs.lib;
@@ -55,10 +55,11 @@
       local = import ./pkgs;
     in
     with pkgs.lib; {
-      formatter.${system} = pkgs.alejandra;
+      formatter.${system} = pkgs.nixpkgs-fmt;
       packages.${system} = pkgs.local;
 
-      overlays.default = final: prev: let
+      overlays.default = final: prev:
+        let
           locals = local {
             inherit final prev flakes;
           };
@@ -66,8 +67,7 @@
         {
           local = locals;
           unstable = importPkgs unstable;
-        }
+        } // locals.override;
-        // locals.override;
 
       nixosConfigurations.vps = makeOverridable nixpkgs.lib.nixosSystem {
         inherit pkgs system;
@@ -80,3 +80,4 @@
       };
     };
 }
+

pkgs/default.nix

@@ -1,8 +1,4 @@
-{
+{ final, prev, flakes }: {
-  final,
-  prev,
-  flakes,
-}: {
   homepage = flakes.homepage.packages.${final.system}.default;
 
   override = { };

sys/default.nix

@@ -1,11 +1,6 @@
+{ config, pkgs, lib, flakes, ... }:
+with lib;
 {
-  config,
-  pkgs,
-  lib,
-  flakes,
-  ...
-}:
-with lib; {
   imports = [
     flakes.vpsadminos.nixosConfigurations.container
     flakes.home-manager.nixosModules.home-manager
@@ -62,7 +57,7 @@ with lib; {
       group = "fabian";
       shell = pkgs.zsh;
       extraGroups = [ "users" "wheel" "networkmanager" "dialout" "libvirtd" ];
-      openssh.authorizedKeys.keyFiles = [../pki/fabian.pub];
+      openssh.authorizedKeys.keyFiles = [ "${flakes.self}/pki/fabian.pub" ];
     };
     groups.fabian.gid = 1000;
   };

sys/home/cli.nix

@@ -1,9 +1,6 @@
+{ lib, pkgs, ... }:
+with lib;
 {
-  lib,
-  pkgs,
-  ...
-}:
-with lib; {
   programs = {
     zsh = {
       enable = true;
@@ -16,7 +13,8 @@ with lib; {
     };
     neovim.enable = true;
   };
-  home.packages = with pkgs; [
+  home.packages = with pkgs;
+    [
       file
       htop
       killall

sys/home/default.nix

@@ -1,11 +1,7 @@
+{ config, pkgs, lib, flakes, ... }:
+with lib;
 {
-  config,
+
-  pkgs,
-  lib,
-  flakes,
-  ...
-}:
-with lib; {
   imports = [
     ./cli.nix
   ];

sys/srv/bepasty.nix

@@ -1,10 +1,8 @@
+{ lib, pkgs, ... }:
+with lib;
 {
-  lib,
-  pkgs,
-  ...
-}:
-with lib; {
   services = {
+
     nginx = {
       virtualHosts."send.posixlycorrect.com" = {
         enableACME = true;
@@ -16,6 +14,7 @@ with lib; {
         locations."/" = {
           proxyPass = "http://127.0.0.1:8989";
         };
+
       };
     };
 

sys/srv/default.nix

@@ -1,11 +1,6 @@
+{ config, pkgs, lib, flakes, ... }:
+with lib;
 {
-  config,
-  pkgs,
-  lib,
-  flakes,
-  ...
-}:
-with lib; {
   imports = [
     ./net.nix
     ./mediawiki.nix

sys/srv/forgejo.nix

@@ -1,9 +1,6 @@
+{ config, lib, ... }:
+with lib;
 {
-  config,
-  lib,
-  ...
-}:
-with lib; {
   config = {
     environment.etc."fail2ban/filter.d/gitea.local".text = ''
       [Definition]

sys/srv/jellyfin.nix

@@ -1,10 +1,9 @@
+{ lib, pkgs, ... }:
+with lib;
 {
-  lib,
+
-  pkgs,
-  ...
-}:
-with lib; {
   services = {
+
     nginx = {
       virtualHosts."stream.posixlycorrect.com" = {
         enableACME = true;

sys/srv/jitsi.nix

@@ -1,10 +1,9 @@
+{ lib, pkgs, flakes, ... }:
+with lib;
 {
-  lib,
+
-  pkgs,
-  ...
-}:
-with lib; {
   services = {
+
     nginx = {
       virtualHosts."meet.posixlycorrect.com" = {
         enableACME = true;
@@ -15,7 +14,7 @@ with lib; {
         
             ssl_verify_depth 1;
             ssl_verify_client on;
-            ssl_client_certificate ${../../pki/gatekeeper_ca.pem};
+            ssl_client_certificate ${flakes.self}/pki/gatekeeper_ca.pem;
             if ($ssl_client_verify != "SUCCESS") {
               return 403;
             }
@@ -23,6 +22,7 @@ with lib; {
       };
     };
 
+
     jitsi-meet = {
       enable = true;
       hostName = "meet.posixlycorrect.com";

sys/srv/kuma.nix

@@ -1,9 +1,6 @@
+{ lib, pkgs, ... }:
+with lib;
 {
-  lib,
-  pkgs,
-  ...
-}:
-with lib; {
   services = {
     nginx = {
       virtualHosts."status.posixlycorrect.com" = {

sys/srv/matrix.nix

@@ -1,14 +1,10 @@
-{
+{ lib, pkgs, config, flakes, ... }:
-  lib,
+with lib;
-  pkgs,
+let
-  config,
-  flakes,
-  ...
-}:
-with lib; let
   subdomain = "matrix.posixlycorrect.com";
   baseUrl = "https://${subdomain}";
-in {
+in
+{
   # ver https://nixos.org/manual/nixos/stable/#module-services-matrix
   services = {
     matrix-conduit = {
@@ -27,7 +23,8 @@ in {
       };
     };
 
-    nginx.virtualHosts = let
+    nginx.virtualHosts =
+      let
         clientConfig."m.homeserver".base_url = baseUrl;
         serverConfig."m.server" = "${subdomain}:443";
         mkWellKnown = data: ''
@@ -35,7 +32,8 @@ in {
           add_header Access-Control-Allow-Origin *;
           return 200 '${builtins.toJSON data}';
         '';
-    in {
+      in
+      {
         "posixlycorrect.com" = {
           locations."= /.well-known/matrix/server".extraConfig = mkWellKnown serverConfig;
           locations."= /.well-known/matrix/client".extraConfig = mkWellKnown clientConfig;
@@ -52,7 +50,10 @@ in {
           '';
           locations."/_matrix".proxyPass = "http://[::1]:6167";
           locations."/_synapse/client".proxyPass = "http://[::1]:6167";
+
         };
       };
+
+
   };
 }

sys/srv/mediawiki.nix

@@ -1,10 +1,6 @@
+{ lib, pkgs, flakes, ... }:
+with lib;
 {
-  lib,
-  pkgs,
-  flakes,
-  ...
-}:
-with lib; {
   services = {
     nginx = {
       virtualHosts."wiki.posixlycorrect.com" = {

sys/srv/msmtp.nix

@@ -1,9 +1,6 @@
+{ lib, pkgs, ... }:
+with lib;
 {
-  lib,
-  pkgs,
-  ...
-}:
-with lib; {
   users.groups = {
     mailsenders = {
       members = [ "fabian" "mediawiki" ];

sys/srv/net.nix

@@ -1,9 +1,6 @@
+{ lib, pkgs, ... }:
+with lib;
 {
-  lib,
-  pkgs,
-  ...
-}:
-with lib; {
   networking = {
     nftables.enable = true;
     firewall = {

sys/srv/vaultwarden.nix

@@ -1,9 +1,6 @@
+{ config, lib, ... }:
+with lib;
 {
-  config,
-  lib,
-  ...
-}:
-with lib; {
   services = {
     nginx = {
       virtualHosts."vault.posixlycorrect.com" = {
@@ -21,12 +18,10 @@ with lib; {
 
     postgresql = {
       ensureDatabases = [ "vaultwarden" ];
-      ensureUsers = [
+      ensureUsers = [{
-        {
         name = "vaultwarden";
         ensureDBOwnership = true;
-        }
+      }];
-      ];
     };
 
     vaultwarden = {