nextcloud headers fix

config/base.nix

@@ -75,6 +75,7 @@
       "dotnet-runtime-6.0.36"
       "dotnet-sdk-wrapped-6.0.428"
       "dotnet-sdk-6.0.428"
+      "mbedtls-2.28.10"
     ];
   };
   nix = {
@@ -124,29 +125,7 @@
         sops
         ;
     };
-    variables =
+    variables = inputs.self.lib.xdgEnvironment;
-      let
-        XDG_DATA_HOME = "\${HOME}/.local/share";
-        XDG_CONFIG_HOME = "\${HOME}/.config";
-        XDG_CACHE_HOME = "\${HOME}/.cache";
-      in
-      {
-        # PATH
-        inherit XDG_DATA_HOME XDG_CONFIG_HOME XDG_CACHE_HOME;
-        XDG_BIN_HOME = "\${HOME}/.local/bin";
-        XDG_STATE_HOME = "\${HOME}/.local/state";
-        # DEV PATH
-        PSQL_HISTORY = "${XDG_DATA_HOME}/psql_history";
-        REDISCLI_HISTFILE = "${XDG_DATA_HOME}/redis/rediscli_history";
-        WINEPREFIX = "${XDG_DATA_HOME}/wine";
-        # OPTIONS
-        ELECTRUMDIR = "${XDG_DATA_HOME}/electrum";
-        WGETRC = "${XDG_CONFIG_HOME}/wgetrc";
-        XCOMPOSECACHE = "${XDG_CACHE_HOME}/X11/xcompose";
-        "_JAVA_OPTIONS" = "-Djava.util.prefs.userRoot=${XDG_CONFIG_HOME}/java";
-        ORG_DEVICE = "workstation";
-        PATH = [ "\${HOME}/.local/bin" ];
-      };
   };
   programs = {
     nh = {

config/home-manager.nix

@@ -14,22 +14,7 @@ let
     ${pokemon-colorscripts}/bin/pokemon-colorscripts -r --no-title
     export command_timeout=60
   '';
-  commonAliases = {
+  commonAliases = inputs.self.lib.commonAliases // {
-    cp = "cp -i";
-    mv = "mv -i";
-    mkdir = "mkdir -p";
-    mkcd = "(){ mkdir -p \"$1\" && cd \"$1\" }";
-    copy = "xclip -selection clipboard";
-    cdp = "pwd | copy";
-    cfp = "(){ readlink -f \"$1\" | copy }";
-    ".." = "cd ..";
-    "..." = "cd ../..";
-    ".3" = "cd ../../..";
-    ".4" = "cd ../../../..";
-    ".5" = "cd ../../../../..";
-    c = "cat";
-    sc = "systemctl --user";
-    jc = "journalctl --user -xefu";
     open-gallery = ''
       cd /srv/pool/scrapping/JawZ/gallery-dl &&
       xdg-open "$(${fd}/bin/fd . ./ Husbands wikifeet -tdirectory -d 1 | ${fzf}/bin/fzf -i)"'';

config/jawz.nix

@@ -1,11 +1,12 @@
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  inputs,
+  ...
+}:
 let
   inherit (config.networking) hostName;
-  nixosHosts =
+  nixosHosts = inputs.self.lib.getNixosHosts config.my.ips hostName lib;
-    lib.attrNames config.my.ips
-    |> lib.filter (
-      name: !(lib.hasPrefix "wg-" name) && name != "vps" && name != "router" && name != hostName
-    );
   nixosHostsMatch = lib.concatStringsSep " " nixosHosts;
 in
 {
@@ -67,14 +68,14 @@ in
       "plugdev"
       "bluetooth"
     ];
-    openssh.authorizedKeys.keyFiles = [
+    openssh.authorizedKeys.keyFiles = inputs.self.lib.getSshKeys [
-      ../secrets/ssh/ed25519_deacero.pub
+      "deacero"
-      ../secrets/ssh/ed25519_workstation.pub
+      "workstation"
-      ../secrets/ssh/ed25519_server.pub
+      "server"
-      ../secrets/ssh/ed25519_miniserver.pub
+      "miniserver"
-      ../secrets/ssh/ed25519_galaxy.pub
+      "galaxy"
-      ../secrets/ssh/ed25519_phone.pub
+      "phone"
-      ../secrets/ssh/ed25519_vps.pub
+      "vps"
     ];
   };
 }

environments/gnome.nix

@@ -40,6 +40,7 @@
       gamemode-shell-extension # I guess I'm a gamer now?
       burn-my-windows # special effects for when closing windows
       pano # clipboard manager
+      pop-shell
       ;
   };
 }

environments/hyprland.nix

@@ -23,13 +23,11 @@ in
       wl-clipboard-rs
       wf-recorder
       grimblast # screenshots
-
       mako # notification daemon
       libnotify # dependency of mako
       swaylock-effects # screen locker
       yazi # file manager
       imv # images
-
       playerctl # media player control
       ;
   };
@@ -78,27 +76,22 @@ in
           "${mod}, bracketright, changegroupactive, f"
           "${mod}, S, exec, wofi --show drun icons"
           "${mod}, P, pin, active"
-
           "${mod}, left, movefocus, l"
           "${mod}, right, movefocus, r"
           "${mod}, up, movefocus, u"
           "${mod}, down, movefocus, d"
-
           "${mod}, h, movefocus, l"
           "${mod}, l, movefocus, r"
           "${mod}, k, movefocus, u"
           "${mod}, j, movefocus, d"
-
           "${mod} SHIFT, left, movewindow, l"
           "${mod} SHIFT, right, movewindow, r"
           "${mod} SHIFT, up, movewindow, u"
           "${mod} SHIFT, down, movewindow, d"
-
           "${mod} SHIFT, h, movewindow, l"
           "${mod} SHIFT, l, movewindow, r"
           "${mod} SHIFT, k, movewindow, u"
           "${mod} SHIFT, j, movewindow, d"
-
           "${mod}, 1, workspace, 1"
           "${mod}, 2, workspace, 2"
           "${mod}, 3, workspace, 3"
@@ -119,7 +112,6 @@ in
           "${mod} SHIFT, 8, movetoworkspace, 8"
           "${mod} SHIFT, 9, movetoworkspace, 9"
           "${mod} SHIFT, 0, movetoworkspace, 10"
-
           "${mod}, F3, exec, grimblast save area ~/Pictures/screenshots/$(date +'%Y-%m-%d_%H-%M-%S').png"
           "${mod} SHIFT, F3, exec, grimblast save screen ~/Pictures/screenshots/$(date +'%Y-%m-%d_%H-%M-%S').png"
         ];
@@ -128,12 +120,10 @@ in
           "${mod} SHIFT, l, moveactive, 20 0"
           "${mod} SHIFT, k, moveactive, 0 -20"
           "${mod} SHIFT, j, moveactive, 0 20"
-
           "${mod} CTRL, l, resizeactive, 30 0"
           "${mod} CTRL, h, resizeactive, -30 0"
           "${mod} CTRL, k, resizeactive, 0 -10"
           "${mod} CTRL, j, resizeactive, 0 10"
-
           ",XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%+"
           ",XF86AudioLowerVolume, exec, wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%-"
         ];

environments/waybar-style.nix

@@ -30,12 +30,10 @@ in
     border: none;
     min-width: 20px;
   }
-
   #workspaces button.active {
     background: #${colors.base02};
     color: #${colors.base05};
   }
-
   #workspaces button:hover {
     background: #${colors.base01};
     color: #${colors.base04};

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759499898,
+        "lastModified": 1760101617,
-        "narHash": "sha256-UNzYHLWfkSzLHDep5Ckb5tXc0fdxwPIrT+MY4kpQttM=",
+        "narHash": "sha256-8jf/3ZCi+B7zYpIyV04+3wm72BD7Z801IlOzsOACR7I=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "655e067f96fd44b3f5685e17f566b0e4d535d798",
+        "rev": "1826a9923881320306231b1c2090379ebf9fa4f8",
         "type": "github"
       },
       "original": {
@@ -54,16 +54,17 @@
     "base16-fish": {
       "flake": false,
       "locked": {
-        "lastModified": 1622559957,
+        "lastModified": 1754405784,
-        "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
+        "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
         "owner": "tomyun",
         "repo": "base16-fish",
-        "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
+        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
         "type": "github"
       },
       "original": {
         "owner": "tomyun",
         "repo": "base16-fish",
+        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
         "type": "github"
       }
     },
@@ -215,11 +216,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1759362264,
+        "lastModified": 1760948891,
-        "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
+        "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
+        "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
         "type": "github"
       },
       "original": {
@@ -232,6 +233,24 @@
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib_2"
       },
+      "locked": {
+        "lastModified": 1760813311,
+        "narHash": "sha256-lbHQ7FXGzt6/IygWvJ1lCq+Txcut3xYYd6VIpF1ojkg=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "4e627ac2e1b8f1de7f5090064242de9a259dbbc8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_3": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_3"
+      },
       "locked": {
         "lastModified": 1712014858,
         "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
@@ -245,7 +264,7 @@
         "type": "indirect"
       }
     },
-    "flake-parts_3": {
+    "flake-parts_4": {
       "inputs": {
         "nixpkgs-lib": [
           "nur",
@@ -266,7 +285,7 @@
         "type": "github"
       }
     },
-    "flake-parts_4": {
+    "flake-parts_5": {
       "inputs": {
         "nixpkgs-lib": [
           "stylix",
@@ -442,11 +461,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759490292,
+        "lastModified": 1760445448,
-        "narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=",
+        "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "9431db625cd9bb66ac55525479dce694101d6d7a",
+        "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
         "type": "github"
       },
       "original": {
@@ -473,11 +492,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1760143218,
+        "lastModified": 1761340761,
-        "narHash": "sha256-OhJPROcRcwBkjOKkXr/f3/7wuSjhAIqr8WfmEUF9Uuo=",
+        "narHash": "sha256-j12amQpLU23PbblMzw8Tt4whr2PxjP6XXYH99uYGFGc=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "d599513d4a72d66ac62ffdedc41d6653fa81b39e",
+        "rev": "da04afa44e7545771b08f8e0defd2cd1810f1613",
         "type": "github"
       },
       "original": {
@@ -498,11 +517,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749046714,
+        "lastModified": 1759610243,
-        "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=",
+        "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330",
+        "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
         "type": "github"
       },
       "original": {
@@ -681,17 +700,17 @@
     },
     "nix-gaming": {
       "inputs": {
-        "flake-parts": "flake-parts",
+        "flake-parts": "flake-parts_2",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1760146997,
+        "lastModified": 1761356901,
-        "narHash": "sha256-x2sF8Q4tWz3DI166s+KFDXySrK+cN+/YEd3DfhnhBLQ=",
+        "narHash": "sha256-YDySchURSJrS1P8zuzmFqypUS7shY6//0e0JiMZeLSI=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "ad505387568d024654da88fef03d9c5319cba92f",
+        "rev": "a8635e459ff96acbd156a8de613b99d9d6b3676a",
         "type": "github"
       },
       "original": {
@@ -768,6 +787,21 @@
       }
     },
     "nixpkgs-lib_2": {
+      "locked": {
+        "lastModified": 1754788789,
+        "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib_3": {
       "locked": {
         "dir": "lib",
         "lastModified": 1711703276,
@@ -787,11 +821,11 @@
     },
     "nixpkgs-small": {
       "locked": {
-        "lastModified": 1760081104,
+        "lastModified": 1761294158,
-        "narHash": "sha256-n9NgHBtZgLrT1FtJ2W9AvVKM7bXWBgqw/is739m72WQ=",
+        "narHash": "sha256-woFH58dy/EDeL1Li4IarZE9+0p0zdPmCsxCvKA7oYu4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "872106a411643f96e2c9576d247cf96e7c8c1b97",
+        "rev": "e7b2e554a77018dec2f259b782d062500c133d49",
         "type": "github"
       },
       "original": {
@@ -803,11 +837,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1760038930,
+        "lastModified": 1761114652,
-        "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=",
+        "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3",
+        "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
         "type": "github"
       },
       "original": {
@@ -819,11 +853,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1759994382,
+        "lastModified": 1761173472,
-        "narHash": "sha256-wSK+3UkalDZRVHGCRikZ//CyZUJWDJkBDTQX1+G77Ow=",
+        "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7",
+        "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb",
         "type": "github"
       },
       "original": {
@@ -835,7 +869,7 @@
     },
     "nixtendo-switch": {
       "inputs": {
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts_3",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -856,17 +890,17 @@
     },
     "nur": {
       "inputs": {
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_4",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1760150127,
+        "lastModified": 1761364085,
-        "narHash": "sha256-McDmxx/bruodgHLD4sFIl0fKkEkNj5VE3DglImfslrk=",
+        "narHash": "sha256-4BKMXhQ8SSYOo9NoK221fVYM86xMw5smoqHvwmLaDEo=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "886a5646695563cbae3c1e10369c6070c7645e73",
+        "rev": "e9f1e9e9cb027dd87785534261d0feb0097dfcfa",
         "type": "github"
       },
       "original": {
@@ -911,11 +945,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758108966,
+        "lastModified": 1760663237,
-        "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
+        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
+        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
         "type": "github"
       },
       "original": {
@@ -943,6 +977,7 @@
     "root": {
       "inputs": {
         "doom-emacs": "doom-emacs",
+        "flake-parts": "flake-parts",
         "fonts": "fonts",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
@@ -968,11 +1003,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759635238,
+        "lastModified": 1760998189,
-        "narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=",
+        "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "6e5a38e08a2c31ae687504196a230ae00ea95133",
+        "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
         "type": "github"
       },
       "original": {
@@ -988,7 +1023,7 @@
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-parts": "flake-parts_4",
+        "flake-parts": "flake-parts_5",
         "gnome-shell": "gnome-shell",
         "nixpkgs": [
           "nixpkgs"
@@ -1002,11 +1037,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1759596342,
+        "lastModified": 1760478648,
-        "narHash": "sha256-1Eda1V8pjpviMdBTdDXrFp7jkaUokIgXgBYTZyzDODk=",
+        "narHash": "sha256-Y4l+Y3zUvqIDbyLrtOrzNvp1o50Fp9TYK+iwtwweFU4=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "4d065856e936fc6a99ba55d39ac2df9ded6bedbe",
+        "rev": "1ec254101285777db13922303cc47ded06e10bb3",
         "type": "github"
       },
       "original": {
@@ -1259,11 +1294,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755354946,
+        "lastModified": 1760713634,
-        "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=",
+        "narHash": "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0",
+        "rev": "753bbbdf6a052994da94062e5b753288cef28dfb",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,6 +1,7 @@
 {
   description = "JawZ NixOS flake setup";
   inputs = {
+    flake-parts.url = "github:hercules-ci/flake-parts";
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.05";
     nixpkgs-small.url = "github:nixos/nixpkgs?ref=nixos-25.05-small";
     nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
@@ -59,76 +60,13 @@
     };
   };
   outputs =
-    { self, jawz-scripts, ... }@inputs:
+    inputs:
-    let
+    inputs.flake-parts.lib.mkFlake { inherit inputs; } {
-      inherit (self) outputs;
+      imports = [
-      system = "x86_64-linux";
+        ./parts/core.nix
-      mkpkgs =
+        ./parts/hosts.nix
-        repo:
+        ./parts/packages.nix
-        import repo {
+        ./parts/devshells.nix
-          inherit system;
-          config.allowUnfree = true;
-        };
-      langList = builtins.filter (name: name != "emacs") (
-        builtins.map (file: builtins.replaceStrings [ ".nix" ] [ "" ] (baseNameOf file)) (
-          builtins.attrNames (builtins.readDir ./modules/dev)
-        )
-      );
-      commonModules = name: [
-        {
-          nixpkgs.overlays = [
-            (import ./config/overlay.nix { inherit mkpkgs inputs; })
-            inputs.doom-emacs.overlays.default
-          ];
-        }
-        {
-          nix.registry = {
-            jawz.flake = self;
-            unstable.flake = inputs.nixpkgs-unstable;
-          };
-        }
-        ./hosts/${name}/configuration.nix
-        inputs.nur.modules.nixos.default
-        inputs.sops-nix.nixosModules.sops
-        inputs.stylix.nixosModules.stylix
-        inputs.nixtendo-switch.nixosModules.nixtendo-switch
       ];
-      createConfig =
-        name: local-nixpkgs:
-        let
-          lib = local-nixpkgs.lib // inputs.home-manager.lib;
-        in
-        lib.nixosSystem {
-          inherit system;
-          specialArgs = {
-            inherit inputs outputs;
-          };
-          modules = commonModules name;
-        };
-    in
-    {
-      nixosConfigurations = {
-        workstation = createConfig "workstation" inputs.nixpkgs;
-        miniserver = createConfig "miniserver" inputs.nixpkgs-small;
-        server = createConfig "server" inputs.nixpkgs-small;
-        galaxy = createConfig "galaxy" inputs.nixpkgs-small;
-        emacs = createConfig "emacs" inputs.nixpkgs;
-      };
-      packages.${system} = (jawz-scripts.packages.${system} or { }) // {
-        emacs-vm = inputs.nixos-generators.nixosGenerate {
-          inherit system;
-          specialArgs = {
-            inherit inputs outputs;
-          };
-          modules = commonModules "emacs";
-          format = "vm";
-        };
-      };
-      devShells.${system} = builtins.listToAttrs (
-        map (name: {
-          inherit name;
-          value = self.nixosConfigurations.emacs.config.devShells.${name};
-        }) langList
-      );
     };
 }

hosts/miniserver/configuration.nix

@@ -1,17 +1,17 @@
-{ config, ... }:
+{ config, inputs, ... }:
 {
   imports = [
     ./hardware-configuration.nix
     ../../config/base.nix
     ../../config/stylix.nix
   ];
-  my = import ./toggles.nix // {
+  my = import ./toggles.nix { inherit inputs; } // {
     nix.cores = 3;
     nix.maxJobs = 8;
     users.nixremote.enable = true;
-    users.nixremote.authorizedKeys = [
+    users.nixremote.authorizedKeys = inputs.self.lib.getSshKeys [
-      ../../secrets/ssh/ed25519_nixworkstation.pub
+      "nixworkstation"
-      ../../secrets/ssh/ed25519_nixserver.pub
+      "nixserver"
     ];
   };
   nix.buildMachines =

hosts/miniserver/toggles.nix

@@ -1,16 +1,6 @@
+{ inputs }:
 let
-  mkEnabled = name: {
+  inherit (inputs.self.lib) mkEnabled mkEnabledWithProxy enableList;
-    inherit name;
-    value.enable = true;
-  };
-  mkEnabledWithProxy = name: {
-    inherit name;
-    value = {
-      enable = true;
-      enableProxy = true;
-    };
-  };
-  enableList = func: list: list |> map func |> builtins.listToAttrs;
 in
 {
   emacs.enable = true;

hosts/server/configuration.nix

@@ -2,6 +2,7 @@
   pkgs,
   config,
   lib,
+  inputs,
   ...
 }:
 {
@@ -10,12 +11,12 @@
     ../../config/base.nix
     ../../config/stylix.nix
   ];
-  my = import ./toggles.nix { inherit config; } // {
+  my = import ./toggles.nix { inherit config inputs; } // {
     nix.cores = 6;
     users.nixremote.enable = true;
-    users.nixremote.authorizedKeys = [
+    users.nixremote.authorizedKeys = inputs.self.lib.getSshKeys [
-      ../../secrets/ssh/ed25519_nixworkstation.pub
+      "nixworkstation"
-      ../../secrets/ssh/ed25519_nixminiserver.pub
+      "nixminiserver"
     ];
     network.firewall.enabledServicePorts = true;
     network.firewall.additionalPorts = [

hosts/server/toggles.nix

@@ -1,17 +1,7 @@
-{ config }:
+{ config, inputs }:
 let
-  mkEnabled = name: {
+  inherit (inputs.self.lib) mkEnabled enableList;
-    inherit name;
+  mkEnabledIp = inputs.self.lib.mkEnabledIp config.my.ips.wg-server;
-    value.enable = true;
-  };
-  mkEnabledIp = name: {
-    inherit name;
-    value = {
-      enable = true;
-      ip = config.my.ips.wg-server;
-    };
-  };
-  enableList = func: list: list |> map func |> builtins.listToAttrs;
 in
 {
   mainServer = "server";

hosts/workstation/configuration.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   config,
+  inputs,
   ...
 }:
 let
@@ -22,13 +23,13 @@ in
     ../../config/stylix.nix
     ../../environments/gnome.nix
   ];
-  my = import ./toggles.nix // {
+  my = import ./toggles.nix { inherit inputs; } // {
     nix.cores = 8;
     nix.maxJobs = 8;
     users.nixremote.enable = true;
-    users.nixremote.authorizedKeys = [
+    users.nixremote.authorizedKeys = inputs.self.lib.getSshKeys [
-      ../../secrets/ssh/ed25519_nixserver.pub
+      "nixserver"
-      ../../secrets/ssh/ed25519_nixminiserver.pub
+      "nixminiserver"
     ];
   };
   home-manager.users.jawz = {

hosts/workstation/toggles.nix

@@ -1,9 +1,6 @@
+{ inputs }:
 let
-  mkEnabled = name: {
+  inherit (inputs.self.lib) mkEnabled enableList;
-    inherit name;
-    value.enable = true;
-  };
-  enableList = func: list: list |> map func |> builtins.listToAttrs;
 in
 {
   stylix.enable = true;

modules/apps/gaming.nix

@@ -5,6 +5,21 @@
   pkgs,
   ...
 }:
+let
+  retroarchWithCores = pkgs.retroarch.withCores (
+    cores:
+    builtins.attrValues {
+      inherit (cores)
+        mgba # gba
+        pcsx2 # ps2
+        dolphin # wii / gamecube
+        snes9x2010 # snes
+        desmume # nintendo ds
+        citra # 3ds
+        ;
+    }
+  );
+in
 {
   imports = [ inputs.nix-gaming.nixosModules.platformOptimizations ];
   options.my.apps = {
@@ -36,6 +51,7 @@
       # };
     };
     users.users.jawz.packages = builtins.attrValues {
+      inherit retroarchWithCores;
       inherit (pkgs)
         shipwright # zelda OoT port
         mangohud # fps & stats overlay
@@ -47,12 +63,8 @@
         ns-usbloader # load games into my switch
         # emulators
         rpcs3 # ps3
-        pcsx2 # ps2
         cemu # wii u
-        dolphin-emu # wii
-        snes9x-gtk # snes
         ryubing # switch
-        azahar # 3Ds
         prismlauncher # minecraft launcher with jdk overlays
         ;
     };

modules/dev/emacs.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -14,10 +15,12 @@
         "doom/templates/programming.org".source = ../../dotfiles/doom/templates/programming.org;
       };
       services.lorri.enable = true;
-      programs.${config.my.shell.type}.shellAliases = {
+      programs.${config.my.shell.type}.shellAliases =
-        edit = "emacsclient -t";
+        inputs.self.lib.mergeAliases inputs.self.lib.commonAliases
-        e = "edit";
+          {
-      };
+            edit = "emacsclient -t";
+            e = "edit";
+          };
     };
     users.users.jawz.packages = builtins.attrValues {
       inherit (pkgs.xorg) xwininfo;

modules/dev/nix.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -33,12 +34,14 @@ in
   };
   config = lib.mkIf config.my.dev.nix.enable {
     users.users.jawz = { inherit packages; };
-    home-manager.users.jawz.programs.${shellType}.shellAliases = {
+    home-manager.users.jawz.programs.${shellType}.shellAliases =
-      nixformat = ''
+      inputs.self.lib.mergeAliases inputs.self.lib.commonAliases
-        deadnix -e && \
+        {
-        nix run nixpkgs#nixfmt-tree && \
+          nixformat = ''
-        statix fix
+            deadnix -e && \
-      '';
+            nix run nixpkgs#nixfmt-tree && \
-    };
+            statix fix
+          '';
+        };
   };
 }

modules/factories/mkserver.nix

@@ -53,58 +53,8 @@ let
       default = null;
     };
   };
-  proxy = locations: {
-    inherit locations;
-    forceSSL = true;
-    enableACME = true;
-    http2 = true;
-  };
-  proxyReverse =
-    cfg:
-    proxy {
-      "/" = {
-        proxyPass = "http://${cfg.ip}:${toString cfg.port}/";
-        proxyWebsockets = cfg.enableSocket;
-      };
-    };
-  proxyReverseFix =
-    cfg:
-    let
-      useLocalhost = cfg.hostName == config.networking.hostName;
-      localHeaders = ''
-        proxy_set_header   Host $host;
-        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header   X-Forwarded-Proto $scheme;
-      '';
-    in
-    proxyReverse cfg
-    // {
-      extraConfig = ''
-        ${if useLocalhost then localHeaders else ""}
-        proxy_set_header   X-Forwarded-Host $host;
-        proxy_set_header   Upgrade $http_upgrade;
-        proxy_set_header   Connection $http_connection;
-        proxy_redirect     off;
-        proxy_http_version 1.1;
-      '';
-    };
-  proxyReversePrivate =
-    cfg:
-    proxyReverse cfg
-    // {
-      extraConfig = ''
-        ssl_verify_client on;
-        ssl_client_certificate ${cfg.certPath};
-        error_page 403 /403.html;
-      '';
-    };
 in
 {
-  inherit
+  inherit mkOptions;
-    mkOptions
+  mkServerOptions = mkOptions;
-    proxy
-    proxyReverse
-    proxyReverseFix
-    proxyReversePrivate
-    ;
 }

modules/modules.nix

@@ -1,23 +1,23 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  inputs,
+  ...
+}:
 let
   filterNames = file: file != "librewolf.nix";
-  autoImport =
-    dir:
-    builtins.readDir ./${dir}
-    |> builtins.attrNames
-    |> builtins.filter (file: builtins.match ".*\\.nix" file != null && filterNames file)
-    |> map (file: ./${dir}/${file});
 in
 {
   imports =
-    autoImport "apps"
+    inputs.self.lib.autoImport ./apps filterNames
-    ++ autoImport "dev"
+    ++ inputs.self.lib.autoImport ./dev filterNames
-    ++ autoImport "scripts"
+    ++ inputs.self.lib.autoImport ./scripts filterNames
-    ++ autoImport "servers"
+    ++ inputs.self.lib.autoImport ./servers filterNames
-    ++ autoImport "services"
+    ++ inputs.self.lib.autoImport ./services filterNames
-    ++ autoImport "shell"
+    ++ inputs.self.lib.autoImport ./shell filterNames
-    ++ autoImport "network"
+    ++ inputs.self.lib.autoImport ./network filterNames
     ++ [
+      ./factories/mkscript.nix
       ./nix/build.nix
       ./users/nixremote.nix
     ];
@@ -105,65 +105,71 @@ in
     enableProxy = lib.mkEnableOption "nginx reverse proxy for services";
   };
   config = {
-    assertions = [
+    assertions =
-      {
+      # PostgreSQL dependency assertions
-        assertion = config.my.servers.nextcloud.enable -> config.my.servers.postgres.enable;
+      inputs.self.lib.mkPostgresDependencies config [
-        message = "Nextcloud requires PostgreSQL to be enabled";
+        {
-      }
+          service = "nextcloud";
-      {
+          name = "Nextcloud";
-        assertion = config.my.servers.vaultwarden.enable -> config.my.servers.postgres.enable;
+        }
-        message = "Vaultwarden requires PostgreSQL to be enabled";
+        {
-      }
+          service = "vaultwarden";
-      {
+          name = "Vaultwarden";
-        assertion = config.my.servers.firefly-iii.enable -> config.my.servers.postgres.enable;
+        }
-        message = "Firefly III requires PostgreSQL to be enabled";
+        {
-      }
+          service = "firefly-iii";
-      {
+          name = "Firefly III";
-        assertion = config.my.servers.mealie.enable -> config.my.servers.postgres.enable;
+        }
-        message = "Mealie requires PostgreSQL to be enabled";
+        {
-      }
+          service = "mealie";
-      {
+          name = "Mealie";
-        assertion = config.my.servers.shiori.enable -> config.my.servers.postgres.enable;
+        }
-        message = "Shiori requires PostgreSQL to be enabled";
+        {
-      }
+          service = "shiori";
-      {
+          name = "Shiori";
-        assertion = config.my.servers.ryot.enable -> config.my.servers.postgres.enable;
+        }
-        message = "Ryot requires PostgreSQL to be enabled";
+        {
-      }
+          service = "ryot";
-      {
+          name = "Ryot";
-        assertion = config.my.servers.synapse.enable -> config.my.servers.postgres.enable;
+        }
-        message = "Matrix Synapse requires PostgreSQL to be enabled";
+        {
-      }
+          service = "synapse";
-      {
+          name = "Matrix Synapse";
-        assertion = config.my.servers.gitea.enable -> config.my.servers.postgres.enable;
+        }
-        message = "Gitea requires PostgreSQL to be enabled";
+        {
-      }
+          service = "gitea";
-      {
+          name = "Gitea";
-        assertion =
+        }
-          config.my.enableProxy
+      ]
-          -> (builtins.any (s: s.enableProxy or false) (builtins.attrValues config.my.servers));
+      ++
-        message = "enableProxy is true but no services have enableProxy enabled";
+      # Other assertions
-      }
+      [
-      {
+        {
-        assertion =
+          assertion =
-          config.my.enableContainers
+            config.my.enableProxy
-          || !(builtins.any (opt: opt) [
+            -> (builtins.any (s: s.enableProxy or false) (builtins.attrValues config.my.servers));
-            config.my.servers.ryot.enable
+          message = "enableProxy is true but no services have enableProxy enabled";
-            config.my.servers.lidarr.enable
+        }
-            config.my.servers.prowlarr.enable
+        {
-            config.my.servers.maloja.enable
+          assertion =
-            config.my.servers.multi-scrobbler.enable
+            config.my.enableContainers
-            config.my.servers.flame.enable
+            || !(builtins.any (opt: opt) [
-            config.my.servers.flameSecret.enable
+              config.my.servers.ryot.enable
-            config.my.servers.metube.enable
+              config.my.servers.lidarr.enable
-            config.my.servers.go-vod.enable
+              config.my.servers.prowlarr.enable
-            config.my.servers.tranga.enable
+              config.my.servers.maloja.enable
-            config.my.servers.drpp.enable
+              config.my.servers.multi-scrobbler.enable
-            config.my.servers.plex-discord-bot.enable
+              config.my.servers.flame.enable
-          ]);
+              config.my.servers.flameSecret.enable
-        message = "Container services are enabled but enableContainers is false";
+              config.my.servers.metube.enable
-      }
+              config.my.servers.go-vod.enable
-    ];
+              config.my.servers.tranga.enable
+              config.my.servers.drpp.enable
+              config.my.servers.plex-discord-bot.enable
+            ]);
+          message = "Container services are enabled but enableContainers is false";
+        }
+      ];
     virtualisation = {
       containers.enable = true;
       oci-containers.backend = "podman";

modules/network/firewall.nix

@@ -1,18 +1,24 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  inputs,
+  ...
+}:
 let
-  nativeServicesWithOpenFirewall = [
+  firewallBlacklist = [
-    "adguardhome"
+    "sabnzbd"
-    "plex"
+    "lidarr"
-    "nix-serve"
+    "maloja"
-    "radarr"
+    "tranga"
-    "sonarr"
+    "flame"
-    "jellyfin"
+    "flameSecret"
-    "prowlarr"
+    "ryot"
-    "bazarr"
+    "drpp"
-    "stash"
+    "metube"
-    "ombi"
+    "multi-scrobbler"
-    "flaresolverr"
+    "plex-discord-bot"
   ];
+  nativeServicesWithOpenFirewall = inputs.self.lib.getServicesWithNativeFirewall config firewallBlacklist;
   servicesConfig = lib.listToAttrs (
     map (serviceName: {
       name = serviceName;
@@ -37,17 +43,7 @@ in
   config = lib.mkIf config.my.network.firewall.enabledServicePorts {
     services = servicesConfig;
     networking.firewall.allowedTCPPorts =
-      config.my.network.firewall.staticPorts
+      inputs.self.lib.generateFirewallPorts config nativeServicesWithOpenFirewall lib
-      ++ config.my.network.firewall.additionalPorts
-      ++ (
-        config.my.servers
-        |> lib.filterAttrs (
-          name: srv:
-          (srv.enable or false) && (srv ? port) && !(builtins.elem name nativeServicesWithOpenFirewall)
-        )
-        |> lib.attrValues
-        |> map (srv: srv.port)
-      )
       ++ (lib.optionals config.services.nginx.enable [
         config.services.nginx.defaultHTTPListenPort
         config.services.nginx.defaultSSLListenPort

modules/network/nginx.nix

@@ -1,6 +1,10 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  inputs,
+  ...
+}:
 let
-  setup = import ../factories/mkserver.nix { inherit lib config; };
   proxyReverseServices = [
     "firefox-syncserver"
     "readeck"
@@ -44,11 +48,11 @@ let
       cfg = config.my.servers.${serviceName};
       proxyFunc =
         if serviceConfig.type == "proxyReverse" then
-          setup.proxyReverse
+          inputs.self.lib.proxyReverse
         else if serviceConfig.type == "proxyReverseFix" then
-          setup.proxyReverseFix
+          inputs.self.lib.proxyReverseFix
         else if serviceConfig.type == "proxyReversePrivate" then
-          setup.proxyReversePrivate
+          inputs.self.lib.proxyReversePrivate
         else
           throw "Unknown proxy type: ${serviceConfig.type}";
     in

modules/scripts/download.nix

@@ -6,7 +6,6 @@
   ...
 }:
 {
-  imports = [ ../factories/mkscript.nix ];
   options.my.units = {
     download.enable = lib.mkEnableOption "media download automation scripts";
     downloadManga.enable = lib.mkEnableOption "manga download automation";
@@ -17,32 +16,26 @@
     in
     {
       home-manager.users.jawz.programs.${config.my.shell.type} = {
-        shellAliases = {
+        shellAliases = inputs.self.lib.mergeAliases inputs.self.lib.commonAliases {
           dl = "${download}/bin/download -u jawz -i";
           comic = ''dl "$(cat "$LC" | fzf --multi --exact -i)"'';
           gallery = ''dl "$(cat "$LW" | fzf --multi --exact -i)"'';
         };
       }
-      // (
+      //
-        if config.my.shell.type == "bash" then
+        inputs.self.lib.shellConditional config.my.shell.type
-          {
+          ''
-            initExtra = ''
+            list_root=$XDG_CONFIG_HOME/jawz/lists/jawz
-              list_root=$XDG_CONFIG_HOME/jawz/lists/jawz
+            export LW=$list_root/watch.txt
-              export LW=$list_root/watch.txt
+            export LI=$list_root/instant.txt
-              export LI=$list_root/instant.txt
+            export LC=$list_root/comic.txt
-              export LC=$list_root/comic.txt
+          ''
-            '';
+          ''
-          }
+            list_root=$XDG_CONFIG_HOME/jawz/lists/jawz
-        else
+            export LW=$list_root/watch.txt
-          {
+            export LI=$list_root/instant.txt
-            initContent = ''
+            export LC=$list_root/comic.txt
-              list_root=$XDG_CONFIG_HOME/jawz/lists/jawz
+          '';
-              export LW=$list_root/watch.txt
-              export LI=$list_root/instant.txt
-              export LC=$list_root/comic.txt
-            '';
-          }
-      );
       systemd.user = {
         services =
           let

modules/scripts/ffmpeg4discord.nix

@@ -1,6 +1,5 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.ffmpeg4discord = {
     enable = lib.mkDefault false;
     install = true;

modules/scripts/ffmpreg.nix

@@ -1,6 +1,5 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.ffmpreg = {
     enable = lib.mkDefault false;
     install = true;

modules/scripts/find-dup-episode.nix

@@ -1,6 +1,5 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.find-dup-episodes = {
     enable = lib.mkDefault false;
     install = true;

modules/scripts/library-report.nix

@@ -1,6 +1,5 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.library-report = {
     enable = lib.mkDefault false;
     install = true;

modules/scripts/manage-library.nix

@@ -1,6 +1,5 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.manage-library = {
     enable = lib.mkDefault false;
     install = true;

modules/scripts/pika-list.nix

@@ -1,6 +1,5 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.pika-list = {
     enable = lib.mkDefault false;
     install = true;

modules/scripts/run.nix

@@ -1,6 +1,5 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.run = {
     enable = lib.mkDefault false;
     install = true;

modules/scripts/split-dir.nix

@@ -1,6 +1,5 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.split-dir = {
     enable = lib.mkDefault false;
     install = true;

modules/scripts/stream-dl.nix

@@ -6,7 +6,6 @@
   ...
 }:
 {
-  imports = [ ../factories/mkscript.nix ];
   options.my.units.stream-dl.enable = lib.mkEnableOption "streaming media download service";
   config =
     let

modules/scripts/tasks.nix

@@ -1,6 +1,5 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.tasks = {
     enable = lib.mkDefault false;
     install = true;

modules/scripts/tuh-activity-logger.nix

@@ -1,6 +1,5 @@
 { inputs, lib, ... }:
 {
-  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.tuh-activity-logger = {
     enable = lib.mkDefault false;
     install = true;

modules/scripts/update-dns.nix

@@ -6,7 +6,6 @@
   ...
 }:
 {
-  imports = [ ../factories/mkscript.nix ];
   config = lib.mkIf config.my.secureHost {
     sops.secrets = {
       cloudflare-api.sopsFile = ../../secrets/env.yaml;

modules/scripts/update-org-agenda-cache.nix

@@ -5,7 +5,6 @@
   ...
 }:
 {
-  imports = [ ../factories/mkscript.nix ];
   config.my.scripts.update-org-agenda-cache = {
     enable = lib.mkDefault false;
     install = config.my.emacs.enable;

modules/servers/atticd.nix

@@ -1,7 +1,11 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  ...
+}:
 let
-  cfg = config.my.servers.atticd;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.atticd;
 in
 {
   options.my.servers.atticd = setup.mkOptions "atticd" "cache" 2343;
@@ -13,6 +17,7 @@ in
       settings = {
         listen = "[::]:${toString cfg.port}";
         jwt = { };
+        database.heartbeat = true; # 5 minutes
         chunking = {
           nar-size-threshold = 64 * 1024; # 64 KiB
           min-size = 16 * 1024; # 16 KiB
@@ -29,5 +34,12 @@ in
         };
       };
     };
+    systemd.services.atticd = {
+      serviceConfig = {
+        TimeoutStartSec = "15min";
+        TimeoutStopSec = "5min";
+        MemoryMax = "4G";
+      };
+    };
   };
 }

modules/servers/audiobookshelf.nix

@@ -1,7 +1,11 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  ...
+}:
 let
-  cfg = config.my.servers.audiobookshelf;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.audiobookshelf;
 in
 {
   options.my.servers.audiobookshelf = setup.mkOptions "audiobookshelf" "audiobooks" 5687;

modules/servers/bazarr.nix

@@ -1,7 +1,11 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  ...
+}:
 let
-  cfg = config.my.servers.bazarr;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.bazarr;
 in
 {
   options.my.servers.bazarr = setup.mkOptions "bazarr" "subs" config.services.bazarr.listenPort;

modules/servers/drpp.nix

@@ -1,7 +1,11 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  ...
+}:
 let
-  cfg = config.my.servers.drpp;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.drpp;
 in
 {
   options.my.servers.drpp = setup.mkOptions "drpp" "drpp" 0;

modules/servers/firefox-syncserver.nix

@@ -1,7 +1,11 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  ...
+}:
 let
-  cfg = config.my.servers.firefox-syncserver;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.firefox-syncserver;
 in
 {
   options.my.servers.firefox-syncserver = setup.mkOptions "firefox-syncserver" "sync" 4233;

modules/servers/flame.nix

@@ -1,4 +1,8 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  ...
+}:
 let
   cfg = config.my.servers.flame;
   cfgS = config.my.servers.flameSecret;

modules/servers/gitea.nix

@@ -5,8 +5,8 @@
   ...
 }:
 let
-  cfg = config.my.servers.gitea;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.gitea;
 in
 {
   imports = [

modules/servers/homepage.nix

@@ -1,7 +1,11 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  ...
+}:
 let
-  cfg = config.my.servers.homepage;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.homepage;
 in
 {
   options.my.servers.homepage = setup.mkOptions "homepage" "home" 8082;

modules/servers/jellyfin.nix

@@ -8,6 +8,7 @@
 let
   cfg = config.my.servers.jellyfin;
   inherit (inputs.jawz-scripts.packages.x86_64-linux) sub-sync;
+  setup = import ../factories/mkserver.nix { inherit lib config; };
   sub-sync-path = [
     pkgs.nix
     pkgs.bash
@@ -19,7 +20,6 @@ let
     pkgs.gum
     sub-sync
   ];
-  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers.jellyfin = setup.mkOptions "jellyfin" "flix" 8096;

modules/servers/kavita.nix

@@ -1,7 +1,11 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  ...
+}:
 let
-  cfg = config.my.servers.kavita;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.kavita;
 in
 {
   options.my.servers.kavita = setup.mkOptions "kavita" "library" config.services.kavita.settings.Port;

modules/servers/lidarr.nix

@@ -1,7 +1,11 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  ...
+}:
 let
-  cfg = config.my.servers.lidarr;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.lidarr;
 in
 {
   options.my.servers.lidarr = setup.mkOptions "lidarr" "music" 8686;

modules/servers/maloja.nix

@@ -1,7 +1,11 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  ...
+}:
 let
-  cfg = config.my.servers.maloja;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.maloja;
 in
 {
   options.my.servers.maloja = setup.mkOptions "maloja" "maloja" 42010;

modules/servers/mealie.nix

@@ -1,7 +1,11 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  ...
+}:
 let
-  cfg = config.my.servers.mealie;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.mealie;
 in
 {
   options.my.servers.mealie = setup.mkOptions "mealie" "mealie" 9925;

modules/servers/metube.nix

@@ -1,7 +1,11 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  ...
+}:
 let
-  cfg = config.my.servers.metube;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.metube;
 in
 {
   options.my.servers.metube = setup.mkOptions "metube" "bajameesta" 8881;

modules/servers/microbin.nix

@@ -1,7 +1,11 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  ...
+}:
 let
-  cfg = config.my.servers.microbin;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.microbin;
 in
 {
   options.my.servers.microbin = setup.mkOptions "microbin" "copy" 8086;

modules/servers/multi-scrobbler.nix

@@ -1,7 +1,11 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  ...
+}:
 let
-  cfg = config.my.servers.multi-scrobbler;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.multi-scrobbler;
 in
 {
   options.my.servers.multi-scrobbler = setup.mkOptions "multi-scrobbler" "scrobble" 9078;

modules/servers/nextcloud.nix

@@ -6,6 +6,7 @@
   ...
 }:
 let
+  setup = import ../factories/mkserver.nix { inherit lib config; };
   commonProxyConfig = ''
     proxy_set_header Host $host;
   '';
@@ -28,10 +29,9 @@ let
       };
     }
   );
-  pytensorflow = pkgs.python311.withPackages (ps: [ ps.tensorflow ]);
+  pytensorflow = pkgs.python3.withPackages (ps: [ ps.tensorflow ]);
   cfg = config.my.servers.nextcloud;
   cfgC = config.my.servers.collabora;
-  setup = import ../factories/mkserver.nix { inherit lib config; };
 in
 {
   options.my.servers = {
@@ -175,6 +175,14 @@ in
           ];
           #vps
           serverAliases = [ "cloud.rotehaare.art" ];
+          extraConfig = ''
+            add_header X-XSS-Protection "1; mode=block" always;
+            add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always;
+            add_header X-Content-Type-Options "nosniff" always;
+            add_header X-Frame-Options "SAMEORIGIN" always;
+            add_header Referrer-Policy "no-referrer-when-downgrade" always;
+            add_header X-Permitted-Cross-Domain-Policies "none" always;
+          '';
           locations = {
             "/".proxyWebsockets = true;
             "~ ^/nextcloud/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|oc[ms]-provider/.+|.+/richdocumentscode/proxy).php(?:$|/)" =
@@ -187,6 +195,11 @@ in
           http2 = true;
           locations = {
             # static files
+            "^~ /browser" = {
+              proxyPass = cfgC.local;
+              extraConfig = commonProxyConfig;
+            };
+            # Legacy static files (for compatibility)
             "^~ /loleaflet" = {
               proxyPass = cfgC.local;
               extraConfig = commonProxyConfig;
@@ -202,11 +215,21 @@ in
               extraConfig = commonProxyConfig;
             };
             # download, presentation, image upload and websocket
+            "~ ^/cool" = {
+              proxyPass = cfgC.local;
+              extraConfig = commonWebsocketConfig;
+            };
+            # Legacy websocket (for compatibility)
             "~ ^/lool" = {
               proxyPass = cfgC.local;
               extraConfig = commonWebsocketConfig;
             };
             # Admin Console websocket
+            "^~ /cool/adminws" = {
+              proxyPass = cfgC.local;
+              extraConfig = commonWebsocketConfig;
+            };
+            # Legacy Admin Console websocket (for compatibility)
             "^~ /lool/adminws" = {
               proxyPass = cfgC.local;
               extraConfig = commonWebsocketConfig;
@@ -231,23 +254,23 @@ in
       };
       collabora = lib.mkIf cfgC.enable {
         autoStart = true;
-        image = "collabora/code";
+        image = "collabora/code:latest";
-        imageFile = pkgs.dockerTools.pullImage {
-          imageName = "collabora/code";
-          imageDigest = "sha256:aab41379baf5652832e9237fcc06a768096a5a7fccc66cf8bd4fdb06d2cbba7f";
-          sha256 = "sha256-M66lynhzaOEFnE15Sy1N6lBbGDxwNw6ap+IUJAvoCLs=";
-        };
         ports = [ "9980:9980" ];
         environment = {
           TZ = config.my.timeZone;
           domain = cfg.host;
-          aliasgroup1 = "${cfg.host}:443";
+          aliasgroup1 = "${cfg.url}:443";
-          aliasgroup2 = "cloud.rotehaare.art:443";
+          aliasgroup2 = "https://cloud.rotehaare.art:443";
+          server_name = cfgC.host;
           dictionaries = "en_CA en_US es_MX es_ES fr_FR it pt_BR ru";
           extra_params = ''
             --o:ssl.enable=false
             --o:ssl.termination=true
+            --o:remote_font_config.url=${cfg.url}/apps/richdocuments/settings/fonts.json
+            --o:logging.level=information
           '';
+          DONT_GEN_SSL_CERT = "1";
+          SLEEPFORDEBUGGER = "0";
         };
         extraOptions = [
           "--cap-add"

modules/servers/nix-serve.nix

@@ -5,8 +5,8 @@
   ...
 }:
 let
-  cfg = config.my.servers.nix-serve;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.nix-serve;
 in
 {
   options.my.servers.nix-serve = setup.mkOptions "nix-serve" "cache" 5000;

modules/servers/ombi.nix

@@ -1,7 +1,11 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  ...
+}:
 let
-  cfg = config.my.servers.ombi;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.ombi;
 in
 {
   options.my.servers.ombi = setup.mkOptions "ombi" "requests" 3425;

modules/servers/plex-discord-bot.nix

@@ -1,7 +1,11 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  ...
+}:
 let
-  cfg = config.my.servers.plex-discord-bot;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.plex-discord-bot;
   name = "plex-discord-bot";
 in
 {

modules/servers/plex.nix

@@ -4,8 +4,8 @@
   ...
 }:
 let
-  cfg = config.my.servers.plex;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.plex;
 in
 {
   options.my.servers.plex = setup.mkOptions "plex" "plex" 32400;

modules/servers/portfolio.nix

@@ -4,8 +4,8 @@
   ...
 }:
 let
-  cfg = config.my.websites.portfolio;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.websites.portfolio;
 in
 {
   options.my.websites.portfolio = setup.mkOptions "portfolio" "portfolio" 0;

modules/servers/prowlarr.nix

@@ -4,8 +4,8 @@
   ...
 }:
 let
-  cfg = config.my.servers.prowlarr;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.prowlarr;
 in
 {
   options.my.servers.prowlarr = setup.mkOptions "prowlarr" "indexer" 9696;

modules/servers/qbittorrent.nix

@@ -1,8 +1,8 @@
 {
+  inputs,
   lib,
   config,
   pkgs,
-  inputs,
   ...
 }:
 let
@@ -36,6 +36,10 @@ let
         ;
     }
   );
+  torrentCompletionScript = pkgs.writeShellScript "qbit-torrent-completion" ''
+    chown jawz:piracy -R "$1"
+    chmod -R 775 "$1"
+  '';
 in
 {
   options.my.servers = {
@@ -50,6 +54,7 @@ in
     };
   };
   config = lib.mkIf (config.my.servers.qbittorrent.enable && config.my.secureHost) {
+    my.network.firewall.additionalPorts = [ config.my.servers.qbittorrent.port ];
     home-manager.users.jawz.xdg.dataFile.vuetorrent.source = vuetorrent;
     sops.secrets =
       let
@@ -72,7 +77,10 @@ in
         "unpackerr/radarr-api" = mkUnpackerrSecret;
       };
     systemd = {
-      packages = [ pkgs.qbittorrent-nox ];
+      packages = [
+        pkgs.qbittorrent-nox
+        torrentCompletionScript
+      ];
       services."qbittorrent-nox@jawz" = {
         enable = true;
         overrideStrategy = "asDropin";

modules/servers/radarr.nix

@@ -1,7 +1,11 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  ...
+}:
 let
-  cfg = config.my.servers.radarr;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.radarr;
 in
 {
   options.my.servers.radarr = setup.mkOptions "radarr" "movies" 7878;

modules/servers/readeck.nix

@@ -1,7 +1,11 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  ...
+}:
 let
-  cfg = config.my.servers.readeck;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.readeck;
 in
 {
   options.my.servers.readeck = setup.mkOptions "readeck" "laters" 9546;

modules/servers/ryot.nix

@@ -1,7 +1,11 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  ...
+}:
 let
-  cfg = config.my.servers.ryot;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.ryot;
 in
 {
   options.my.servers.ryot = setup.mkOptions "ryot" "tracker" 8765;

modules/servers/sabnzbd.nix

@@ -12,6 +12,7 @@ in
     };
   };
   config = lib.mkIf cfg.enable {
+    my.network.firewall.additionalPorts = [ cfg.port ];
     services.sabnzbd = {
       inherit (cfg) enable;
       group = "piracy";

modules/servers/shiori.nix

@@ -1,7 +1,11 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  ...
+}:
 let
-  cfg = config.my.servers.shiori;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.shiori;
 in
 {
   options.my.servers.shiori = setup.mkOptions "shiori" "bookmarks" 4368;

modules/servers/sonarr.nix

@@ -1,7 +1,11 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  ...
+}:
 let
-  cfg = config.my.servers.sonarr;
   setup = import ../factories/mkserver.nix { inherit lib config; };
+  cfg = config.my.servers.sonarr;
 in
 {
   options.my.servers.sonarr = setup.mkOptions "sonarr" "series" 8989;

modules/servers/stash.nix

@@ -5,9 +5,9 @@
   ...
 }:
 let
+  setup = import ../factories/mkserver.nix { inherit lib config; };
   cfg = config.my.servers.stash;
   cfgS = config.services.stash;
-  setup = import ../factories/mkserver.nix { inherit lib config; };
   stashPythonFHS = pkgs.buildFHSEnv {
     name = "stash-python-fhs";
     targetPkgs =

modules/servers/synapse.nix

@@ -5,10 +5,10 @@
   ...
 }:
 let
+  setup = import ../factories/mkserver.nix { inherit lib config; };
   cfg = config.my.servers.synapse;
   cfgE = config.my.servers.element;
   domain = "wedsgk5ac2qcaf9yb.click";
-  setup = import ../factories/mkserver.nix { inherit lib config; };
   clientConfig."m.homeserver".base_url = cfg.url;
   serverConfig."m.server" = "${cfg.host}:443";
   mkWellKnown = data: ''

modules/servers/tranga.nix

@@ -1,4 +1,8 @@
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  ...
+}:
 let
   setup = import ../factories/mkserver.nix { inherit lib config; };
   cfg = config.my.servers.tranga;

modules/shell/multimedia.nix

@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   ...
@@ -24,7 +25,7 @@
       };
       gallery-dl = {
         enable = true;
-        settings = import ../../dotfiles/gallery-dl.nix;
+        settings = inputs.self.lib.importDotfile ../../dotfiles/gallery-dl.nix;
       };
       ${config.my.shell.type} = {
         initExtra = lib.mkAfter ''

modules/shell/tools.nix

@@ -57,7 +57,7 @@ in
         };
       };
       ${shellType} = {
-        shellAliases = {
+        shellAliases = inputs.self.lib.mergeAliases inputs.self.lib.commonAliases {
           cd = "z";
           hh = "hstr";
           ls = "eza --icons --group-directories-first";
@@ -70,26 +70,20 @@ in
             uniq --count | sort -rn'';
         };
       }
-      // (
+      //
-        if shellType == "bash" then
+        inputs.self.lib.shellConditional shellType
-          {
+          ''
-            initExtra = ''
+            if command -v fzf-share >/dev/null; then
-              if command -v fzf-share >/dev/null; then
+            source "$(fzf-share)/key-bindings.bash"
-              source "$(fzf-share)/key-bindings.bash"
+            source "$(fzf-share)/completion.bash"
-              source "$(fzf-share)/completion.bash"
+            fi
-              fi
+          ''
-            '';
+          ''
-          }
+            if command -v fzf-share >/dev/null; then
-        else
+            source "$(fzf-share)/key-bindings.bash"
-          {
+            source "$(fzf-share)/completion.bash"
-            initContent = ''
+            fi
-              if command -v fzf-share >/dev/null; then
+          '';
-              source "$(fzf-share)/key-bindings.bash"
-              source "$(fzf-share)/completion.bash"
-              fi
-            '';
-          }
-      );
     };
     programs = {
       starship.enable = true;

modules/users/nixremote.nix

@@ -1,13 +1,18 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  inputs,
+  ...
+}:
 {
   options.my.users.nixremote = {
     enable = lib.mkEnableOption "nixremote user for distributed builds";
     authorizedKeys = lib.mkOption {
       type = lib.types.listOf lib.types.path;
-      default = [
+      default = inputs.self.lib.getSshKeys [
-        ../../secrets/ssh/ed25519_nixworkstation.pub
+        "nixworkstation"
-        ../../secrets/ssh/ed25519_nixserver.pub
+        "nixserver"
-        ../../secrets/ssh/ed25519_nixminiserver.pub
+        "nixminiserver"
       ];
       description = "List of SSH public key files to authorize for nixremote user";
     };

parts/core.nix

@@ -0,0 +1,217 @@
+{ inputs, ... }:
+let
+  system = "x86_64-linux";
+  mkpkgs =
+    repo:
+    import repo {
+      inherit system;
+      config.allowUnfree = true;
+    };
+in
+{
+  systems = [ system ];
+  flake = {
+    lib = {
+      commonModules = name: [
+        ../hosts/${name}/configuration.nix
+        inputs.nur.modules.nixos.default
+        inputs.sops-nix.nixosModules.sops
+        inputs.stylix.nixosModules.stylix
+        inputs.nixtendo-switch.nixosModules.nixtendo-switch
+        {
+          nixpkgs.overlays = [
+            (import ../config/overlay.nix { inherit mkpkgs inputs; })
+            inputs.doom-emacs.overlays.default
+          ];
+        }
+        {
+          nix.registry = {
+            jawz.flake = inputs.self;
+            unstable.flake = inputs.nixpkgs-unstable;
+          };
+        }
+      ];
+      createConfig =
+        name: local-nixpkgs:
+        let
+          lib = local-nixpkgs.lib // inputs.home-manager.lib;
+        in
+        lib.nixosSystem {
+          inherit system;
+          modules = inputs.self.lib.commonModules name;
+          specialArgs = {
+            inherit inputs;
+            outputs = inputs.self;
+          };
+        };
+      langList =
+        builtins.readDir ../modules/dev
+        |> builtins.attrNames
+        |> map (file: baseNameOf file |> builtins.replaceStrings [ ".nix" ] [ "" ])
+        |> builtins.filter (name: name != "emacs");
+      autoImport =
+        dir: filterFn:
+        builtins.readDir dir
+        |> builtins.attrNames
+        |> builtins.filter (file: builtins.match ".*\\.nix" file != null && filterFn file)
+        |> map (file: dir + "/${file}");
+      proxy = locations: {
+        inherit locations;
+        forceSSL = true;
+        enableACME = true;
+        http2 = true;
+      };
+      proxyReverse =
+        cfg:
+        inputs.self.lib.proxy {
+          "/" = {
+            proxyPass = "http://${cfg.ip}:${toString cfg.port}/";
+            proxyWebsockets = cfg.enableSocket or false;
+          };
+        };
+      proxyReverseFix =
+        cfg:
+        let
+          useLocalhost = cfg.hostName == cfg.hostName;
+          localHeaders = ''
+            proxy_set_header   Host $host;
+            proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header   X-Forwarded-Proto $scheme;
+          '';
+        in
+        inputs.self.lib.proxyReverse cfg
+        // {
+          extraConfig = ''
+            ${if useLocalhost then localHeaders else ""}
+            proxy_set_header   X-Forwarded-Host $host;
+            proxy_set_header   Upgrade $http_upgrade;
+            proxy_set_header   Connection $http_connection;
+            proxy_redirect     off;
+            proxy_http_version 1.1;
+          '';
+        };
+      proxyReversePrivate =
+        cfg:
+        inputs.self.lib.proxyReverse cfg
+        // {
+          extraConfig = ''
+            ssl_verify_client on;
+            ssl_client_certificate ${cfg.certPath};
+            error_page 403 /403.html;
+          '';
+        };
+      commonAliases = {
+        cp = "cp -i";
+        mv = "mv -i";
+        mkdir = "mkdir -p";
+        mkcd = "(){ mkdir -p \"$1\" && cd \"$1\" }";
+        copy = "xclip -selection clipboard";
+        cdp = "pwd | copy";
+        cfp = "(){ readlink -f \"$1\" | copy }";
+        ".." = "cd ..";
+        "..." = "cd ../..";
+        ".3" = "cd ../../..";
+        ".4" = "cd ../../../..";
+        ".5" = "cd ../../../../..";
+        c = "cat";
+        sc = "systemctl --user";
+        jc = "journalctl --user -xefu";
+      };
+      xdgEnvironment =
+        let
+          XDG_DATA_HOME = "\${HOME}/.local/share";
+          XDG_CONFIG_HOME = "\${HOME}/.config";
+          XDG_CACHE_HOME = "\${HOME}/.cache";
+        in
+        {
+          inherit XDG_DATA_HOME XDG_CONFIG_HOME XDG_CACHE_HOME;
+          XDG_BIN_HOME = "\${HOME}/.local/bin";
+          XDG_STATE_HOME = "\${HOME}/.local/state";
+          PSQL_HISTORY = "${XDG_DATA_HOME}/psql_history";
+          REDISCLI_HISTFILE = "${XDG_DATA_HOME}/redis/rediscli_history";
+          WINEPREFIX = "${XDG_DATA_HOME}/wine";
+          ELECTRUMDIR = "${XDG_DATA_HOME}/electrum";
+          WGETRC = "${XDG_CONFIG_HOME}/wgetrc";
+          XCOMPOSECACHE = "${XDG_CACHE_HOME}/X11/xcompose";
+          "_JAVA_OPTIONS" = "-Djava.util.prefs.userRoot=${XDG_CONFIG_HOME}/java";
+          ORG_DEVICE = "workstation";
+          PATH = [ "\${HOME}/.local/bin" ];
+        };
+      getNixosHosts =
+        ips: hostName: lib:
+        builtins.attrNames ips
+        |> builtins.filter (
+          name: !(lib.hasPrefix "wg-" name) && name != "vps" && name != "router" && name != hostName
+        );
+      shellConditional =
+        shellType: bashContent: zshContent:
+        if shellType == "bash" then { initExtra = bashContent; } else { initContent = zshContent; };
+      mergeAliases = baseAliases: extraAliases: baseAliases // extraAliases;
+      importDotfile = path: import path;
+      getServicesWithNativeFirewall =
+        config: blacklist:
+        config.my.servers
+        |> builtins.attrNames
+        |> builtins.filter (
+          name:
+          (config.my.servers.${name}.enable or false)
+          && !(builtins.elem name blacklist)
+          && builtins.hasAttr name config.services
+          && (config.services.${name} ? openFirewall)
+        );
+      generateFirewallPorts =
+        config: nativeServices: lib:
+        config.my.network.firewall.staticPorts
+        ++ config.my.network.firewall.additionalPorts
+        ++ (
+          config.my.servers
+          |> lib.filterAttrs (
+            name: srv: (srv.enable or false) && (srv ? port) && !(builtins.elem name nativeServices)
+          )
+          |> lib.attrValues
+          |> map (srv: srv.port)
+        );
+      mkEnabled = name: {
+        inherit name;
+        value.enable = true;
+      };
+      mkEnabledWithProxy = name: {
+        inherit name;
+        value = {
+          enable = true;
+          enableProxy = true;
+        };
+      };
+      mkEnabledIp = ip: name: {
+        inherit name;
+        value = {
+          enable = true;
+          inherit ip;
+        };
+      };
+      enableList = func: list: list |> map func |> builtins.listToAttrs;
+      mkPostgresDependency = config: serviceName: displayName: {
+        assertion = config.my.servers.${serviceName}.enable -> config.my.servers.postgres.enable;
+        message = "${displayName} requires PostgreSQL to be enabled";
+      };
+      mkPostgresDependencies =
+        config: serviceMap:
+        serviceMap |> map (entry: inputs.self.lib.mkPostgresDependency config entry.service entry.name);
+      sshKeys = {
+        deacero = ../secrets/ssh/ed25519_deacero.pub;
+        workstation = ../secrets/ssh/ed25519_workstation.pub;
+        server = ../secrets/ssh/ed25519_server.pub;
+        miniserver = ../secrets/ssh/ed25519_miniserver.pub;
+        galaxy = ../secrets/ssh/ed25519_galaxy.pub;
+        phone = ../secrets/ssh/ed25519_phone.pub;
+        vps = ../secrets/ssh/ed25519_vps.pub;
+        emacs = ../secrets/ssh/ed25519_emacs.pub;
+        # Build user keys (nixremote)
+        nixworkstation = ../secrets/ssh/ed25519_nixworkstation.pub;
+        nixserver = ../secrets/ssh/ed25519_nixserver.pub;
+        nixminiserver = ../secrets/ssh/ed25519_nixminiserver.pub;
+      };
+      getSshKeys = keyNames: keyNames |> map (name: inputs.self.lib.sshKeys.${name});
+    };
+  };
+}

parts/devshells.nix

@@ -0,0 +1,12 @@
+{ inputs, ... }:
+{
+  perSystem = _: {
+    devShells =
+      inputs.self.lib.langList
+      |> map (name: {
+        inherit name;
+        value = inputs.self.nixosConfigurations.emacs.config.devShells.${name};
+      })
+      |> builtins.listToAttrs;
+  };
+}

parts/hosts.nix

@@ -0,0 +1,10 @@
+{ inputs, ... }:
+{
+  flake.nixosConfigurations = {
+    workstation = inputs.self.lib.createConfig "workstation" inputs.nixpkgs;
+    miniserver = inputs.self.lib.createConfig "miniserver" inputs.nixpkgs-small;
+    server = inputs.self.lib.createConfig "server" inputs.nixpkgs-small;
+    galaxy = inputs.self.lib.createConfig "galaxy" inputs.nixpkgs-small;
+    emacs = inputs.self.lib.createConfig "emacs" inputs.nixpkgs;
+  };
+}

parts/packages.nix

@@ -0,0 +1,18 @@
+{ inputs, ... }:
+{
+  perSystem =
+    { system, ... }:
+    {
+      packages = (inputs.jawz-scripts.packages.${system} or { }) // {
+        emacs-vm = inputs.nixos-generators.nixosGenerate {
+          inherit system;
+          modules = inputs.self.lib.commonModules "emacs";
+          format = "vm";
+          specialArgs = {
+            inherit inputs;
+            outputs = inputs.self;
+          };
+        };
+      };
+    };
+}