test

update aurora
2026-03-06 19:39:21 -06:00 · 2026-03-06 19:35:52 -06:00 · 2026-03-06 19:31:03 -06:00 · 2026-03-06 19:17:00 -06:00 · 2026-03-06 19:07:55 -06:00 · 2026-03-06 19:05:37 -06:00
113 changed files with 4620 additions and 5379 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,3 @@
 [submodule "machines/laptop"]
 	path = machines/laptop
 	url = ssh://gitea@gitea.esotericbytes.com:2222/Blunkall-Technologies/laptop
-[submodule "machines/android"]
-	path = machines/android
-	url = ssh://gitea@gitea.esotericbytes.com:2222/Blunkall-Technologies/android
--- a/flake-parts.nix
+++ b/flake-parts.nix
@@ -0,0 +1,12 @@
+{ inputs, ... }: {
+
+    imports = [
+        inputs.home-manager.flakeModules.home-manager
+        inputs.disko.flakeModules.default
+    ];
+
+    systems = [
+        "x86_64-linux"
+        "aarch64-linux"
+    ];
+}
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1769428758,
-        "narHash": "sha256-0G/GzF7lkWs/yl82bXuisSqPn6sf8YGTnbEdFOXvOfU=",
+        "lastModified": 1772292445,
+        "narHash": "sha256-4F1Q7U313TKUDDovCC96m/Za4wZcJ3yqtu4eSrj8lk8=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "def5e74c97370f15949a67c62e61f1459fcb0e15",
+        "rev": "1dbbba659c1cef0b0202ce92cadfe13bae550e8f",
        "type": "github"
      },
      "original": {
@@ -33,6 +33,27 @@
        "type": "github"
      }
    },
+    "aurora": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "home-manager": "home-manager",
+        "import-tree": "import-tree",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1772847308,
+        "narHash": "sha256-Gqi7kEVS+f7ZUbWPu3GWnmTA7HkLJLESdByPWlM/AeM=",
+        "ref": "refs/heads/master",
+        "rev": "dcd330939be56daa7033b2a0572336c798a5c79f",
+        "revCount": 4,
+        "type": "git",
+        "url": "https://gitea.esotericbytes.com/Blunkall-Technologies/Aurora"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://gitea.esotericbytes.com/Blunkall-Technologies/Aurora"
+      }
+    },
    "disko": {
      "inputs": {
        "nixpkgs": [
@@ -40,11 +61,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1769524058,
-        "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=",
+        "lastModified": 1772699110,
+        "narHash": "sha256-jkyo/9fZVB3F/PHk3fVK1ImxJBZ71DCOYZvAz4R4v4E=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d",
+        "rev": "42affa9d33750ac0a0a89761644af20d8d03e6ee",
        "type": "github"
      },
      "original": {
@@ -61,11 +82,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1770091431,
-        "narHash": "sha256-9Sqq/hxq8ZDLRSzu+edn0OfWG+FAPWFpwMKaJobeLec=",
+        "lastModified": 1772824881,
+        "narHash": "sha256-NqX+JCA8hRV3GoYrsqnHB2IWKte1eQ8NK2WVbJkORcw=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "4f827ff035c6ddc58d04c45abe5b777d356b926a",
+        "rev": "07e1616c9b13fe4794dad4bcc33cd7088c554465",
        "type": "gitlab"
      },
      "original": {
@@ -91,26 +112,46 @@
        "type": "github"
      }
    },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
    "flake-parts": {
      "inputs": {
        "nixpkgs-lib": "nixpkgs-lib"
      },
+      "locked": {
+        "lastModified": 1772408722,
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_2"
+      },
+      "locked": {
+        "lastModified": 1772408722,
+        "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_3": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_3"
+      },
      "locked": {
        "lastModified": 1768135262,
        "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
@@ -125,7 +166,7 @@
        "type": "github"
      }
    },
-    "flake-parts_2": {
+    "flake-parts_4": {
      "inputs": {
        "nixpkgs-lib": [
          "nixvim",
@@ -170,17 +211,35 @@
      }
    },
    "home-manager": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1772845525,
+        "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager_2": {
      "inputs": {
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1769580047,
-        "narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=",
+        "lastModified": 1772633058,
+        "narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826",
+        "rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865",
        "type": "github"
      },
      "original": {
@@ -235,11 +294,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1769284023,
-        "narHash": "sha256-xG34vwYJ79rA2wVC8KFuM8r36urJTG6/csXx7LiiSYU=",
+        "lastModified": 1770511807,
+        "narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=",
        "owner": "hyprwm",
        "repo": "hyprgraphics",
-        "rev": "13c536659d46893596412d180449353a900a1d31",
+        "rev": "7c75487edd43a71b61adb01cae8326d277aab683",
        "type": "github"
      },
      "original": {
@@ -259,17 +318,17 @@
        "hyprutils": "hyprutils",
        "hyprwayland-scanner": "hyprwayland-scanner",
        "hyprwire": "hyprwire",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_3",
        "pre-commit-hooks": "pre-commit-hooks",
        "systems": "systems",
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1770079745,
-        "narHash": "sha256-rQ4no/+LHuHlqDbJopj6fgS9GUsv1NSycrVhIoLPnbs=",
+        "lastModified": 1772833450,
+        "narHash": "sha256-W/2pHWOVr+jCr/Bzm1mndsZdg7kWjYsYsouLk1nCLLk=",
        "ref": "refs/heads/main",
-        "rev": "30756d871845a6058a840642ab1a4c3979f6d782",
-        "revCount": 6859,
+        "rev": "4152ac76d0813d9d0f67d2f04653a13fa6e17433",
+        "revCount": 6996,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland"
@@ -367,11 +426,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1767983607,
-        "narHash": "sha256-8C2co8NYfR4oMOUEsPROOJ9JHrv9/ktbJJ6X1WsTbXc=",
+        "lastModified": 1771866172,
+        "narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=",
        "owner": "hyprwm",
        "repo": "hyprlang",
-        "rev": "d4037379e6057246b408bbcf796cf3e9838af5b2",
+        "rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41",
        "type": "github"
      },
      "original": {
@@ -444,11 +503,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1766253372,
-        "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=",
+        "lastModified": 1771271487,
+        "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9",
+        "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d",
        "type": "github"
      },
      "original": {
@@ -469,11 +528,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1763640274,
-        "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=",
+        "lastModified": 1770501770,
+        "narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=",
        "owner": "hyprwm",
        "repo": "hyprwayland-scanner",
-        "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671",
+        "rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40",
        "type": "github"
      },
      "original": {
@@ -498,11 +557,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1769202094,
-        "narHash": "sha256-gdJr/vWWLRW85ucatSjoBULPB2dqBJd/53CZmQ9t91Q=",
+        "lastModified": 1771606233,
+        "narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=",
        "owner": "hyprwm",
        "repo": "hyprwire",
-        "rev": "a45ca05050d22629b3c7969a926d37870d7dd75c",
+        "rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a",
        "type": "github"
      },
      "original": {
@@ -511,33 +570,43 @@
        "type": "github"
      }
    },
-    "nix-minecraft": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "nixpkgs": "nixpkgs_2",
-        "systems": "systems_2"
-      },
+    "import-tree": {
      "locked": {
-        "lastModified": 1770000653,
-        "narHash": "sha256-QO/twGynxjOSUDtxbqJLshc/Q5/wImLH5O6KV2p9eoE=",
-        "owner": "Infinidoge",
-        "repo": "nix-minecraft",
-        "rev": "6a2ddb643aaf7949caa6158e718c5efc3dda7dc1",
+        "lastModified": 1772344373,
+        "narHash": "sha256-OQQ1MhB9t1J71b2wxRRTdH/Qd8UGG0p+dGspfCf5U1c=",
+        "owner": "vic",
+        "repo": "import-tree",
+        "rev": "10fda59eee7d7970ec443b925f32a1bc7526648c",
        "type": "github"
      },
      "original": {
-        "owner": "Infinidoge",
-        "repo": "nix-minecraft",
+        "owner": "vic",
+        "repo": "import-tree",
+        "type": "github"
+      }
+    },
+    "import-tree_2": {
+      "locked": {
+        "lastModified": 1772344373,
+        "narHash": "sha256-OQQ1MhB9t1J71b2wxRRTdH/Qd8UGG0p+dGspfCf5U1c=",
+        "owner": "vic",
+        "repo": "import-tree",
+        "rev": "10fda59eee7d7970ec443b925f32a1bc7526648c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "vic",
+        "repo": "import-tree",
        "type": "github"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1769461804,
-        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
+        "lastModified": 1772542754,
+        "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
+        "rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4",
        "type": "github"
      },
      "original": {
@@ -548,6 +617,36 @@
      }
    },
    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1772328832,
+        "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib_2": {
+      "locked": {
+        "lastModified": 1772328832,
+        "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib_3": {
      "locked": {
        "lastModified": 1765674936,
        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
@@ -564,11 +663,11 @@
    },
    "nixpkgs-us": {
      "locked": {
-        "lastModified": 1770019141,
-        "narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=",
+        "lastModified": 1772624091,
+        "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137",
+        "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353",
        "type": "github"
      },
      "original": {
@@ -580,11 +679,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1769461804,
-        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
+        "lastModified": 1772433332,
+        "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
+        "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705",
        "type": "github"
      },
      "original": {
@@ -596,11 +695,27 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1770056022,
-        "narHash": "sha256-yvCz+Qmci1bVucXEyac3TdoSPMtjqVJmVy5wro6j/70=",
+        "lastModified": 1772198003,
+        "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1772598333,
+        "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "d04d8548aed39902419f14a8537006426dc1e4fa",
+        "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239",
        "type": "github"
      },
      "original": {
@@ -610,7 +725,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
      "locked": {
        "lastModified": 1769461804,
        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
@@ -626,7 +741,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
      "locked": {
        "lastModified": 1768875095,
        "narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=",
@@ -644,8 +759,8 @@
    },
    "nixvim": {
      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_4",
+        "flake-parts": "flake-parts_3",
+        "nixpkgs": "nixpkgs_5",
        "nixvim": "nixvim_2"
      },
      "locked": {
@@ -664,9 +779,9 @@
    },
    "nixvim_2": {
      "inputs": {
-        "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_5",
-        "systems": "systems_3"
+        "flake-parts": "flake-parts_4",
+        "nixpkgs": "nixpkgs_6",
+        "systems": "systems_2"
      },
      "locked": {
        "lastModified": 1769644746,
@@ -692,11 +807,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1769069492,
-        "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=",
+        "lastModified": 1772024342,
+        "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23",
+        "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476",
        "type": "github"
      },
      "original": {
@@ -707,12 +822,14 @@
    },
    "root": {
      "inputs": {
+        "aurora": "aurora",
        "disko": "disko",
        "firefox-addons": "firefox-addons",
-        "home-manager": "home-manager",
+        "flake-parts": "flake-parts_2",
+        "home-manager": "home-manager_2",
        "hyprland": "hyprland",
-        "nix-minecraft": "nix-minecraft",
-        "nixpkgs": "nixpkgs_3",
+        "import-tree": "import-tree_2",
+        "nixpkgs": "nixpkgs_4",
        "nixpkgs-us": "nixpkgs-us",
        "nixvim": "nixvim",
        "sops-nix": "sops-nix"
@@ -725,11 +842,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1769921679,
-        "narHash": "sha256-twBMKGQvaztZQxFxbZnkg7y/50BW9yjtCBWwdjtOZew=",
+        "lastModified": 1772495394,
+        "narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "1e89149dcfc229e7e2ae24a8030f124a31e4f24f",
+        "rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff",
        "type": "github"
      },
      "original": {
@@ -768,21 +885,6 @@
        "type": "github"
      }
    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
    "xdph": {
      "inputs": {
        "hyprland-protocols": [
--- a/flake.nix
+++ b/flake.nix
@@ -21,187 +21,32 @@
            inputs.nixpkgs.follows = "nixpkgs";
        };

+        flake-parts.url = "github:hercules-ci/flake-parts";
+
+        import-tree.url = "github:vic/import-tree";

        firefox-addons = {
            url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
            inputs.nixpkgs.follows = "nixpkgs";
        };

-        nix-minecraft.url = "github:Infinidoge/nix-minecraft";
-
-        #simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.11";
-
        hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";

        nixvim.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai";

+        aurora.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Aurora";
+
        self.submodules = true;
    };

-    outputs = { self, nixpkgs, home-manager, ... } @ inputs: {
-
-        profiles = let 
-            dir = builtins.readDir ./profiles;
-            filtered = builtins.filter (x: dir.${x} == "directory") (builtins.attrNames dir);
-        in (builtins.listToAttrs 
-            (builtins.map 
-                (name: ({
-                    inherit name;
-                        
-                    value = { ... }: {
-                        imports = [
+    outputs = { ... } @ inputs: 
+    inputs.flake-parts.lib.mkFlake { inherit inputs; }
+    (inputs.import-tree [ 
+        ./profiles 
+        ./homes 
+        ./machines 
        ./system 
-                            ./profiles/${name}
-                        ];
-                    };
-                })) filtered)
-            );
-
-        homes = let 
-            dir = builtins.readDir ./homes;
-            filtered = builtins.filter (x: dir.${x} == "directory") (builtins.attrNames dir);
-        in (builtins.listToAttrs 
-            (builtins.map 
-                (name: ({
-                    inherit name;
-                        
-                    value = { ... } @ exputs: {
-                        imports = [ (import ./homes/${name}/home-manager (exputs // inputs)) ];
-                    };
-
-                })) filtered)
-            );
-        
-        iso = (nixpkgs.lib.nixosSystem {
-                system = "x86_64-linux";
-                specialArgs = { 
-                    inputs = inputs // { 
-                        nathan = self.homes.nathan;
-                        inherit self;
-                    }; 
-                };
-                modules = [
-                    self.profiles.iso
-                ];
-            }).config.system.build.isoImage;
-
-        templates = {
-            nixos = {
-                welcomeText = ''
-                    #Welcome to Olympus!
-                    Have Fun!
-                '';
-
-                description = ''
-                    Generate this where you want your config.
-                '';
-
-                path = ./templates/nixos;
-
-            };
-
-            home-manager = {
-                welcomeText = ''
-                    #Welcome to Olympus!
-                    Have Fun!
-                '';
-
-                description = ''
-                    Generate this where you want your config.
-                '';
-
-                path = ./templates/home-manager;
-
-            };
-
-            nix-on-droid = {
-                welcomeText = ''
-                    #Welcome to Olympus!
-                    Have Fun!
-                '';
-
-                description = ''
-                    Generate this where you want your config.
-                '';
-
-                path = ./templates/nix-on-droid;
-
-            };
-
-            machines = let 
-                dir = builtins.readDir ./machines;
-                filtered = builtins.filter (x: dir.${x} == "directory") (builtins.attrNames dir);
-            in (builtins.listToAttrs 
-                (builtins.map 
-                    (name: ({
-                        inherit name;
-
-                        value = {
-                            welcomeText = ''
-                                #Welcome to Olympus!
-
-                                ##Warning:
-                                This is a config for ${name}, an established machine!
-                                It may require significant alterations to be usable!
-                            '';
-
-                            description = ''
-                                Generate this where you want your config.
-                            '';
-
-                            path = ./machines/${name};
-                        };
-
-                    })) filtered)
-               );
-
-            homes = let 
-                dir = builtins.readDir ./homes;
-                filtered = builtins.filter (x: dir.${x} == "directory") (builtins.attrNames dir);
-            in (builtins.listToAttrs 
-                (builtins.map 
-                    (name: ({
-                        inherit name;
-
-                        value = {
-                            welcomeText = ''
-                                #Welcome home, ${name}!
-                                Your config is right here.
-                            '';
-
-                            description = ''
-                                Generate this where you want your config.
-                            '';
-
-                            path = ./homes/${name};
-                        };
-
-                    })) filtered)
-               );
-
-            default = self.templates.nixos;
-        };
-
-
-        nixosConfigurations = let 
-                dir = builtins.readDir ./machines;
-                filtered = builtins.filter (x: dir.${x} == "directory" && x != "android") (builtins.attrNames dir);
-            in (builtins.listToAttrs 
-                (builtins.map 
-                    (name: ({
-                        inherit name;
-
-                        value = nixpkgs.lib.nixosSystem {
-                            specialArgs = inputs;
-
-                            modules = [
-                                { sysconfig.host = name; }
-                                ./machines/${name}
-                                self.profiles.${name}
-                            ];
-                        };
-
-                    })) filtered)
-               );
-    };
+        ./templates/default.nix
+        ./flake-parts.nix
+    ]);
 }
--- a/homes/nathan/flake.nix
+++ b/homes/nathan/flake.nix
@@ -1,40 +0,0 @@
-{
-
-    description = "Home-Manager Configuration";
-
-    inputs = {
-
-        nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
-
-        home-manager = {
-            url = "github:nix-community/home-manager/release-25.11";
-            inputs.nixpkgs.follows = "nixpkgs";
-        };
-
-        olympus = {
-            url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Olympus";
-            inputs.nixpkgs.follows = "nixpkgs";
-            inputs.home-manager.follows = "home-manager";
-        };
-    };
-
-    outputs = { self, nixpkgs, home-manager, olympus, ... } @ inputs: {
-
-        homeConfigurations = {
-            nathan = home-manager.lib.homeManagerConfiguration {
-                pkgs = import nixpkgs {
-                    system = builtins.currentSystem;
-                };
-
-                modules = [
-                    olympus.homes.nathan
-                    ./home.nix
-                ];
-
-                extraSpecialArgs = {
-                    inherit inputs;
-                };
-            };
-        };
-    };
-}
--- a/homes/nathan/home-manager/default.nix
+++ b/homes/nathan/home-manager/default.nix
@@ -1,11 +1,8 @@
-{ config, lib, pkgs, inputs, ... }: {
+{ inputs, ... }: {

-    imports = let 
-        dir = builtins.readDir ./.;
-    in (builtins.map (x: ./${x}) (builtins.filter 
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    )) ++ [
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
+
+        imports = [
            inputs.sops-nix.homeManagerModules.sops
        ];

@@ -47,9 +44,11 @@
                hyprland.enable = lib.mkDefault config.homeconfig.graphical;
                hyprlock.enable = lib.mkDefault config.homeconfig.hyprland.enable;
                wal.enable = lib.mkDefault config.homeconfig.graphical;
-            hyprpanel.enable = lib.mkDefault config.homeconfig.hyprland.enable;
+#hyprpanel.enable = lib.mkDefault config.homeconfig.hyprland.enable;
                rofi.enable = lib.mkDefault config.homeconfig.hyprland.enable;
                firefox.enable = lib.mkDefault config.homeconfig.graphical;
+
+                aurora.enable = lib.mkDefault config.homeconfig.hyprland.enable;
            };

            home.username = lib.mkDefault config.homeconfig.name;
@@ -111,4 +110,5 @@
            };

        };
+    };
 }
--- a/homes/nathan/home-manager/dotfiles/default.nix
+++ b/homes/nathan/home-manager/dotfiles/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {

        home.file = {
            ".config/hypr" = lib.mkIf config.homeconfig.hyprland.enable { source = ./hypr; recursive = true; };
@@ -9,4 +11,5 @@
            "Pictures/Wallpaper" = lib.mkIf config.homeconfig.graphical { source = ./Wallpaper; recursive = true; };
        };

+    };
 }
--- a/homes/nathan/home-manager/packages/default.nix
+++ b/homes/nathan/home-manager/packages/default.nix
@@ -1,5 +1,7 @@
-{ config, lib, pkgs, inputs, ... }: let 
-    system = "x86_64-linux";
+{ inputs, ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: let 
+        system = pkgs.stdenv.hostPlatform;

    pkgs-us = import inputs.nixpkgs-us {
        inherit system;
@@ -8,10 +10,6 @@

    in {

-    imports = [ 
-	  ./scripts
-	];
-
        options.homeconfig.minimal = with lib; options.mkOption {
            type = with types; bool;
            default = false;
@@ -102,6 +100,7 @@
         rpi-imager
         tigervnc
         keepassxc
+         localsend

 #3D modeling/printing
         blender
@@ -116,4 +115,5 @@
         ];
        })
        ];
+    };
 }
--- a/homes/nathan/home-manager/packages/scripts/default.nix
+++ b/homes/nathan/home-manager/packages/scripts/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, inputs, ... }: let
+{ inputs, ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: let

        system = "x86_64-linux";

@@ -131,5 +133,6 @@
                   ];
        })
        ];
+    };
 }

--- a/homes/nathan/home-manager/programs/aurora/default.nix
+++ b/homes/nathan/home-manager/programs/aurora/default.nix
@@ -0,0 +1,21 @@
+{ inputs, ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {
+
+        imports = [
+            inputs.aurora.homeModules.default
+        ];
+
+        options.homeconfig.aurora.enable = with lib; mkOption {
+            type = with types; bool;
+            default = false;
+        };
+
+        config = lib.mkIf config.homeconfig.aurora.enable {
+
+            programs.aurora = {
+                enable = true;
+            };
+        };
+    };
+}
--- a/homes/nathan/home-manager/programs/calcurse/default.nix
+++ b/homes/nathan/home-manager/programs/calcurse/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        options.homeconfig.calcurse.enable = lib.options.mkOption {
            type = lib.types.bool;
@@ -11,4 +13,5 @@
                    libnotify
            ];
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/default.nix
+++ b/homes/nathan/home-manager/programs/default.nix
@@ -1,12 +1,6 @@
-{ config, lib, pkgs, inputs, ... }: {
-
-    imports = let 
-        dir = builtins.readDir ./.;
-    in builtins.map (x: ./${x}) (builtins.filter 
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    );
+{ inputs, ... }: {

+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        config = {

@@ -16,4 +10,5 @@

            home.sessionVariables.EDITOR = "nvim";
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/firefox/default.nix
+++ b/homes/nathan/home-manager/programs/firefox/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, inputs, ... }: {
+{ inputs, ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        options.homeconfig.firefox.enable = lib.options.mkOption {
            type = lib.types.bool;
@@ -57,4 +59,5 @@
                };
            };
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/git/default.nix
+++ b/homes/nathan/home-manager/programs/git/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {

        options.homeconfig.git.enable = lib.options.mkOption {
            type = lib.types.bool;
@@ -44,4 +46,5 @@
                };
            };
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/hyprland/default.nix
+++ b/homes/nathan/home-manager/programs/hyprland/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        options.homeconfig.hyprland.enable = lib.options.mkOption {
            type = lib.types.bool;
@@ -48,4 +50,5 @@

            };
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/hyprlock/default.nix
+++ b/homes/nathan/home-manager/programs/hyprlock/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        options.homeconfig.hyprlock.enable = lib.options.mkOption {
            type = lib.types.bool;
@@ -49,4 +51,5 @@
                };
            };
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/hyprpanel/default.nix
+++ b/homes/nathan/home-manager/programs/hyprpanel/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {

        options.homeconfig.hyprpanel.enable = with lib; mkOption {
            type = with types; bool;
@@ -11,4 +13,5 @@
                enable = true;
            };
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/nh/default.nix
+++ b/homes/nathan/home-manager/programs/nh/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, inputs, ... }: {
+{ inputs, ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {

        options.homeconfig.nh.enable = lib.options.mkOption {
            type = lib.types.bool;
@@ -19,4 +21,5 @@
                };
            };
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/pywal/default.nix
+++ b/homes/nathan/home-manager/programs/pywal/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, inputs, ... }: {
+{ inputs, ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        options.homeconfig.wal.enable = lib.options.mkOption {
            type = lib.types.bool;
@@ -15,5 +17,6 @@
            ];


+        };
    };
 }
--- a/homes/nathan/home-manager/programs/quickshell/default.nix
+++ b/homes/nathan/home-manager/programs/quickshell/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {

        options.homeconfig.quickshell.enable = with lib; mkOption {
            type = with types; bool;
@@ -23,4 +25,5 @@
                activeConfig = "default";
            };
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/rofi/default.nix
+++ b/homes/nathan/home-manager/programs/rofi/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        options.homeconfig.rofi.enable = lib.options.mkOption {
            type = lib.types.bool;
@@ -16,5 +18,6 @@
                theme = "/home/nathan/.cache/wal/colors-rofi-dark.rasi";
            };
        };
+    };
 }

--- a/homes/nathan/home-manager/programs/terminal/bash/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/bash/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        home.packages = with pkgs; [ oh-my-posh ];

@@ -12,6 +14,7 @@

                ksh = "kitten ssh";

+                v = "nvim";
                vi = "nvim";
                vim = "nvim";

@@ -28,4 +31,5 @@
                eval "$(oh-my-posh init bash --config ${config.home.homeDirectory}/.config/ohmyposh/ohmyposh.toml)"
            '');
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/terminal/bat/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/bat/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        programs.bat = {

@@ -14,5 +16,6 @@
            ];


+        };
    };
 }
--- a/homes/nathan/home-manager/programs/terminal/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/default.nix
@@ -1,17 +0,0 @@
-{ ... }: {
-
-  imports = [
-    ./bat
-    ./bash
-    ./eza
-    ./fzf
-    ./lf
-    ./tmux
-    ./kitty
-    ./zoxide
-    ./zsh
-    ./ssh
-    ./ohmyposh
-    ./opencode
-  ];
-}
--- a/homes/nathan/home-manager/programs/terminal/eza/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/eza/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        programs.eza = {

@@ -14,4 +16,5 @@

            icons = "auto";
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/terminal/fzf/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/fzf/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        programs.fzf = {

@@ -12,4 +14,5 @@
 #shellIntegrationOptions = [];
            };
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/terminal/kitty/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/kitty/default.nix
@@ -1,4 +1,6 @@
-{ config, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, ... }: {

        programs.kitty = {

@@ -29,5 +31,6 @@ map ctrl+shift+tab previous_tab

                '';
        };
+    };
 }

--- a/homes/nathan/home-manager/programs/terminal/lf/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/lf/default.nix
@@ -1,7 +1,10 @@
 { ... }: {
+
+    flake.homeModules.nathan = { ... }: {
        config = {
            programs.lf = {
                enable = true;
            };
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/terminal/ohmyposh/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/ohmyposh/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        home.packages = with pkgs; [
            oh-my-posh
@@ -133,4 +135,5 @@ c13 = "{color13}"
            c14 = "{color14}"
            c15 = "{color15}"
        '';
+    };
 }
--- a/homes/nathan/home-manager/programs/terminal/opencode/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/opencode/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {

        options.homeconfig.opencode.enable = with lib; mkOption {
            type = with types; bool;
@@ -48,4 +50,5 @@
                };
            };
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/terminal/ripgrep/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/ripgrep/default.nix
@@ -0,0 +1,9 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { ... }: {
+
+        programs.ripgrep = {
+            enable = true;
+        };
+    };
+}
--- a/homes/nathan/home-manager/programs/terminal/ssh/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/ssh/default.nix
@@ -1,5 +1,7 @@
 { ... }: {

+    flake.homeModules.nathan = { ... }: {
+
        programs.ssh = {

            enable = true;
@@ -20,5 +22,6 @@
            enableDefaultConfig = false;


+        };
    };
 }
--- a/homes/nathan/home-manager/programs/terminal/tmux/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/tmux/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        programs.tmux = {

@@ -18,6 +20,7 @@

        };

+    };
 }


--- a/homes/nathan/home-manager/programs/terminal/zoxide/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/zoxide/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { ... }: {

        programs.zoxide = {

@@ -10,4 +12,5 @@
                "--cmd cd"
            ];
        };
+    };
 }
--- a/homes/nathan/home-manager/programs/terminal/zsh/default.nix
+++ b/homes/nathan/home-manager/programs/terminal/zsh/default.nix
@@ -1,4 +1,6 @@
-{ lib, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { lib, ... }: {

        programs.zsh = {

@@ -34,4 +36,5 @@
                share = true;
            };
        };
+    };
 }
--- a/homes/nathan/home-manager/services/default.nix
+++ b/homes/nathan/home-manager/services/default.nix
@@ -1,9 +0,0 @@
-{ ... }: {
-
-    imports = let 
-        dir = builtins.readDir ./.;
-    in builtins.map (x: ./${x}) (builtins.filter 
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    );
-}
--- a/homes/nathan/home-manager/services/mpd/default.nix
+++ b/homes/nathan/home-manager/services/mpd/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {

        options = {
            homeconfig.mpd.enable = lib.options.mkOption {
@@ -38,4 +40,5 @@
            };
        };

+    };
 }
--- a/homes/nathan/home.nix
+++ b/homes/nathan/home.nix
@@ -1,4 +1,6 @@
-{ lib, inputs, ... }:
+{ self, inputs, ... }: {
+
+    flake.homeModules.nathan = { lib, ... }:

    {

@@ -7,7 +9,7 @@
                graphical = lib.mkDefault false;
                minimal = lib.mkDefault false;

-            hyprland.enable = false;
+                hyprland.enable = lib.mkDefault false;
            };


@@ -22,4 +24,15 @@

            programs.home-manager.enable = true;
        };
+    };
+
+    flake.homeConfigurations.nathan = inputs.home-manager.lib.homeManagerConfiguration {
+        pkgs = import inputs.nixpkgs {
+            system = builtins.currentSystem;
+        };
+
+        modules = [
+            self.homeModules.nathan
+        ];
+    };
 }
--- a/machines/android
+++ b/machines/android
--- a/machines/homebox
+++ b/machines/homebox
--- a/machines/laptop
+++ b/machines/laptop
--- a/profiles/container/default.nix
+++ b/profiles/container/default.nix
@@ -1,4 +1,6 @@
-{ config, pkgs, lib, inputs, ... }:
+{ inputs, ... }: {
+
+    flake.nixosModules.container = { config, pkgs, lib, ... }:

    {
        imports =
@@ -154,4 +156,5 @@
            fonts.packages = with pkgs; [ nerd-fonts.fira-code ];

        };
+    };
 }
--- a/profiles/homebox/default.nix
+++ b/profiles/homebox/default.nix
@@ -1,13 +1,15 @@
-{ config, pkgs, lib, disko, sops-nix, home-manager, ... }:
+{ inputs, ... }: {
+
+    flake.nixosModules.homebox = { config, pkgs, lib, ... }:

    {
        imports =
            [
-      disko.nixosModules.default
+                inputs.disko.nixosModules.default

-      sops-nix.nixosModules.sops
+                inputs.sops-nix.nixosModules.sops

-      home-manager.nixosModules.default
+                inputs.home-manager.nixosModules.default

            ];

@@ -58,6 +60,7 @@
                    netbird.enable = true;

                    ollama.enable = false;
+                    avahi.enable = true;
                    wyoming = {
                        enable = true;
                        piper = true;
@@ -87,7 +90,7 @@
                    home-assistant.enable = true;
                    n8n.enable = true;

-                nextcloud.enable = true;
+                    nextcloud.enable = false;
                    jellyfin.enable = true;
                };

@@ -98,8 +101,6 @@

                    code-server.enable = true;

-                minecraft.enable = true;
-
                    sandbox.enable = false;
                };

@@ -112,4 +113,5 @@

        };

+    };
 }
--- a/profiles/iso/default.nix
+++ b/profiles/iso/default.nix
@@ -1,4 +1,6 @@
-{ lib, pkgs, inputs, modulesPath, ... }: {
+{ inputs, ... }: {
+
+    flake.nixosModules.iso = { lib, pkgs, modulesPath, ... }: {

        imports = with inputs; [

@@ -102,5 +104,6 @@
            };


+        };
    };
 }
--- a/profiles/jesstop/default.nix
+++ b/profiles/jesstop/default.nix
@@ -1,10 +1,10 @@
-{ config, pkgs, lib, inputs, ... }:
+{ inputs, ... }: {
+
+    flake.nixosModules.jesstop = { config, pkgs, lib, ... }:

    {

        imports = [
-        ./hardware-configuration.nix
-
 #inputs.home-manager.nixosModules.default

                inputs.sops-nix.nixosModules.sops
@@ -63,17 +63,6 @@

            services.displayManager.enable = true;

-        services.avahi = {
-
-            enable = true;
-            ipv4 = true;
-            ipv6 = true;
-            openFirewall = true;
-            nssmdns4 = true;
-            wideArea = true;
-
-        };
-
 # Enable CUPS to print documents.
            services.printing.enable = true;

@@ -138,5 +127,6 @@
            fonts.packages = with pkgs; [ nerd-fonts.fira-code ];


+        };
    };
 }
--- a/profiles/jesstop/hardware-configuration.nix
+++ b/profiles/jesstop/hardware-configuration.nix
@@ -1,7 +1,6 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ ... }: {
+
+    flake.nixosModules.jesstop = { config, lib, pkgs, modulesPath, ... }:

    {
        imports =
@@ -36,4 +35,5 @@

        nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
        hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    };
 }
--- a/profiles/laptop/default.nix
+++ b/profiles/laptop/default.nix
@@ -1,11 +1,13 @@
-{ config, pkgs, lib, home-manager, sops-nix, ... }:
+{ inputs, ... }: {
+
+    flake.nixosModules.laptop = { config, pkgs, lib, ... }:

    {

        imports = [
-        home-manager.nixosModules.default
+            inputs.home-manager.nixosModules.default

-        sops-nix.nixosModules.sops
+            inputs.sops-nix.nixosModules.sops
        ];

        config = {
@@ -54,6 +56,7 @@
                    pipewire.enable = mkDefault true;
                    netbird.enable = mkDefault true;
                    ollama.enable = mkDefault true;
+                    avahi.enable = mkDefault true;
                };

                programs = {
@@ -83,17 +86,6 @@

            services.displayManager.enable = true;

-        services.avahi = {
-
-            enable = true;
-            ipv4 = true;
-            ipv6 = true;
-            openFirewall = true;
-            nssmdns4 = true;
-            wideArea = true;
-
-        };
-

            environment.shells = with pkgs; [ zsh bashInteractive ];

@@ -122,4 +114,5 @@

        };

+    };
 }
--- a/profiles/live/default.nix
+++ b/profiles/live/default.nix
@@ -1,4 +1,6 @@
-{ pkgs, inputs, ... }: {
+{ inputs, ... }: {
+
+    flake.nixosModules.live = { pkgs, ... }: {

        imports = with inputs; [

@@ -118,4 +120,5 @@

            fonts.packages = with pkgs; [ nerd-fonts.fira-code ];
        };
+    };
 }
--- a/profiles/live/disko.nix
+++ b/profiles/live/disko.nix
@@ -1,4 +1,6 @@
-{
+{ ... }: {
+
+    flake.diskoConfigurations.live = {
        device1 ? throw "Set this to your disk device, e.g. /dev/sda",
        ...
    }: {
@@ -63,4 +65,5 @@
                };
            };    
        };
+    };
 }
--- a/profiles/pi4/default.nix
+++ b/profiles/pi4/default.nix
@@ -1,4 +1,6 @@
-{ config, pkgs, inputs, ... }: {
+{ inputs, ... }: {
+
+    flake.nixosModules.pi4 = { config, pkgs, ... }: {

        imports = [
            ./hardware-configuration.nix
@@ -115,16 +117,6 @@
                        '';
                };

-            services.avahi = {
-
-                enable = true;
-                ipv4 = true;
-                ipv6 = true;
-                openFirewall = true;
-                nssmdns4 = true;
-                wideArea = true;
-
-            };
            };

            sops = {
@@ -142,4 +134,5 @@

            system.stateVersion = "25.05";
        };
+    };
 }
--- a/profiles/pi4/disko.nix
+++ b/profiles/pi4/disko.nix
@@ -1,4 +1,6 @@
-{
+{ ... }: {
+
+    flake.diskoConfigurations.pi4 = {
        device1 ? throw "Set this to your disk device, e.g. /dev/sda",
        ...
    }: {
@@ -63,4 +65,5 @@
                };
            };    
        };
+    };
 }
--- a/profiles/pi4/hardware-configuration.nix
+++ b/profiles/pi4/hardware-configuration.nix
@@ -1,7 +1,6 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ ... }: {
+
+    flake.nixosModules.pi4 = { config, lib, pkgs, modulesPath, ... }:

    {
        imports =
@@ -24,4 +23,5 @@
 # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;

        nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
+    };
 }
--- a/system/default.nix
+++ b/system/default.nix
@@ -1,11 +1,6 @@
-{ config, lib, pkgs, nixpkgs, ... }: {
+{ ... }: {

-    imports = let 
-        dir = builtins.readDir ./.;
-    in builtins.map (x: ./${x}) (builtins.filter 
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    );
+    flake.nixosModules.default = { config, lib, pkgs, nixpkgs, ... }: {

        options.sysconfig = with lib; {
            host = mkOption {
@@ -112,4 +107,6 @@
                };
            };
        };
+    };
 }
+
--- a/system/etc/default.nix
+++ b/system/etc/default.nix
@@ -1,6 +1,10 @@
 { ... }: {
    
+
+    flake.nixosModules.default = { ... }: {
+
        config = {

        };
+    };
 }
--- a/system/packages/default.nix
+++ b/system/packages/default.nix
@@ -1,7 +1,11 @@
-{ pkgs, disko, ... }: {
+{ inputs, ... }: {
+
+    flake.nixosModules.default = { pkgs, ... }: {

        environment.systemPackages = with pkgs; [
            sops
-        disko.packages.${pkgs.stdenv.hostPlatform.system}.disko-install 
+            inputs.disko.packages.${pkgs.stdenv.hostPlatform.system}.disko-install 
        ];
+    };
 }
+
--- a/system/programs/default.nix
+++ b/system/programs/default.nix
@@ -1,9 +0,0 @@
-{ ... }: {
-
-    imports = [
-        ./hyprland
-	    ./hyprpanel
-        ./steam
-    ];
-}
-
--- a/system/programs/hyprland/default.nix
+++ b/system/programs/hyprland/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, hyprland, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, hyprland, ... }: {

        options.sysconfig.programs.hyprland.enable = lib.options.mkOption {
            type = lib.types.bool;
@@ -25,4 +27,6 @@
                portalPackage = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
            };
        };
+    };
 }
+
--- a/system/programs/hyprpanel/default.nix
+++ b/system/programs/hyprpanel/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {

        options.sysconfig.programs.hyprpanel.enable = lib.options.mkOption {
            type = lib.types.bool;
@@ -27,4 +29,6 @@
                    wf-recorder
            ];
        };
+    };
 }
+
--- a/system/programs/steam/default.nix
+++ b/system/programs/steam/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {

        options.sysconfig.programs.steam.enable = lib.options.mkOption {
            type = lib.types.bool;
@@ -11,4 +13,6 @@
                enable = true;
            };
        };
+    };
 }
+
--- a/system/services/avahi/default.nix
+++ b/system/services/avahi/default.nix
@@ -0,0 +1,27 @@
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {
+
+        options = {
+            sysconfig.services.avahi.enable = lib.options.mkOption {
+                type = lib.types.bool;
+                default = false;
+            };
+        };
+
+        config = lib.mkIf config.sysconfig.services.avahi.enable {
+
+            services.avahi = {
+
+                enable = true;
+                ipv4 = true;
+                ipv6 = true;
+                openFirewall = true;
+                nssmdns4 = true;
+                wideArea = true;
+
+            };   
+        };
+    };
+}
+
--- a/system/services/default.nix
+++ b/system/services/default.nix
@@ -1,9 +0,0 @@
-{ ... }: {
-
-    imports = let 
-        dir = builtins.readDir ./.;
-    in builtins.map (x: ./${x}) (builtins.filter 
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    );
-}
--- a/system/services/dynamicDNS/default.nix
+++ b/system/services/dynamicDNS/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {

        options.sysconfig.services.dynamicDNS.enable = with lib; mkOption {

@@ -37,4 +39,6 @@
                script = '''';
            };
        };
+    };
 }
+
--- a/system/services/kdePlasma6/default.nix
+++ b/system/services/kdePlasma6/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {

        options.sysconfig.services.kdePlasma6.enable = lib.options.mkOption {
            type = lib.types.bool;
@@ -28,4 +30,6 @@
                    wl-clipboard # Command-line copy/paste utilities for Wayland
            ];
        };
+    };
 }
+
--- a/system/services/netbird/default.nix
+++ b/system/services/netbird/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, nixpkgs-us, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, nixpkgs-us, ... }: {

        options.sysconfig = {

@@ -23,4 +25,6 @@
                package =   pkgs-us.netbird;
            };
        };
+    };
 }
+
--- a/system/services/novnc/default.nix
+++ b/system/services/novnc/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {

        options.sysconfig.services.novnc.enable = lib.mkOption {
            type = lib.types.bool;
@@ -27,4 +29,6 @@

            networking.firewall.allowedTCPPorts = [ 80 ];
        };
+    };
 }
+
--- a/system/services/ollama/default.nix
+++ b/system/services/ollama/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, nixpkgs-us, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, nixpkgs-us, ... }: {

        options = {
            sysconfig.services.ollama.enable = lib.options.mkOption {
@@ -22,4 +24,6 @@
                in pkgs-us.ollama-cuda;
            };
        };
+    };
 }
+
--- a/system/services/openssh/default.nix
+++ b/system/services/openssh/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {

        options = {
            sysconfig.services.openssh.enable = lib.options.mkOption {
@@ -19,4 +21,6 @@
                };
            };
        };
+    };
 }
+
--- a/system/services/pipewire/default.nix
+++ b/system/services/pipewire/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {

        options = {
            sysconfig.services.pipewire.enable = lib.options.mkOption {
@@ -48,4 +50,5 @@
        };


+    };
 }
--- a/system/services/sddm/default.nix
+++ b/system/services/sddm/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {

        options.sysconfig.services.sddm.enable = lib.mkOption {
            type = lib.types.bool;
@@ -31,4 +33,5 @@
                ];
            };
        };
+    };
 }
--- a/system/services/wyoming/default.nix
+++ b/system/services/wyoming/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {

        options.sysconfig.services.wyoming = {
            enable = lib.options.mkOption {
@@ -63,4 +65,5 @@
            };

        };
+    };
 }
--- a/system/users/default.nix
+++ b/system/users/default.nix
@@ -1,11 +1,6 @@
-{ config, lib, pkgs, ... } @ inputs: {
+{ self, ... }: {

-    imports = let 
-        dir = builtins.readDir ./.;
-    in builtins.map (x: ./${x}) (builtins.filter 
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    );
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {

        options.sysconfig = with lib; {

@@ -97,7 +92,7 @@
        };


-    config = lib.mkIf (config.sysconfig.host != "android") {
+        config = {
            users.users = builtins.mapAttrs (x: y: let
                    cfg = config.sysconfig.users.${x};
                    in {
@@ -115,7 +110,6 @@

            home-manager = {
                backupFileExtension = "backup";
-            extraSpecialArgs = { inherit inputs; };
                useUserPackages = true;
                sharedModules = [];
                users = builtins.listToAttrs (builtins.map 
@@ -123,13 +117,7 @@
                         name = x; 
                         value = (lib.mkMerge ([

-                        (if let 
-                            dir = builtins.readDir ./.; 
-                        in dir ? ${x} && dir.${x} == "directory" then 
-                            import ../../homes/${x}/home-manager 
-                        else {})
-
-                        (if inputs ? ${x} then inputs.${x} else {})
+                            (lib.mkIf (self.homeModules ? ${x}) self.homeModules.${x})

                         ] ++ config.sysconfig.users.${x}.home-manager.extraModules));
                    })
@@ -141,4 +129,5 @@

            };
        };
+    };
 }
--- a/system/users/nathan/default.nix
+++ b/system/users/nathan/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {

        config = lib.mkIf (
            config.sysconfig.users ? nathan && config.sysconfig.users.nathan.usePresets
@@ -21,4 +23,5 @@

            };
        };
+    };
 }
--- a/system/virtualization/containers/authentik/default.nix
+++ b/system/virtualization/containers/authentik/default.nix
@@ -1,71 +0,0 @@
-{ config, lib, ... }: {
-
-    options.sysconfig.containers.authentik.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.sysconfig.containers.authentik.enable {
-
-        sops.secrets."authentik/dbpass" = {};
-
-        networking = {
-
-            nat.internalInterfaces = [ "ve-authentik" ];
-        };
-
-        containers.authentik = {
-
-            autoStart = true;
-            privateNetwork = true;
-            hostAddress = "192.168.100.10";
-            localAddress = "192.168.100.35";
-
-            extraFlags = [
-                "--load-credential=dbpass:${config.sops.secrets."authentik/dbpass".path}"
-            ];
-
-            bindMounts = {
-                "/etc/authentik" = {
-                    hostPath = "/ssd1/Authentik";
-                    isReadOnly = false;
-                };
-            };
-
-            config = {
-                
-                networking.firewall.allowedTCPPorts = [ 9001 ];
-
-                systemd.services.secrets_setup = {
-                    wantedBy = [ "authentik.service" ];
-
-                    serviceConfig = {
-                        LoadCredential = [
-                            "dbpass"
-                        ];
-                    };
-
-                    script = ''
-                        cat ''${CREDENTIALS_DIRECTORY}/dbpass > /etc/authentik/dbpass
-                        chown postgres:postgres /etc/authentik/dbpass
-                    '';
-                };
-                
-                services.authentik = {
-                    enable = true;
-
-                    environmentFile = "/etc/authentik/authentik.env";
-
-                    settings = {
-                        disable_startup_analytics = true;
-                        avatars = "initials";
-                    };
-
-                    worker.listenHTTP = "0.0.0.0:9001";
-                };
-
-                system.stateVersion = "25.05";
-            };
-        };
-    };
-}
--- a/system/virtualization/containers/code-server/default.nix
+++ b/system/virtualization/containers/code-server/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {

        options.sysconfig.containers.code-server.enable = lib.options.mkOption {
            type = lib.types.bool;
@@ -38,4 +40,5 @@
                };
            };
        };
+    };
 }
--- a/system/virtualization/containers/default.nix
+++ b/system/virtualization/containers/default.nix
@@ -1,32 +0,0 @@
-{ ... }: {
-
-    imports = let 
-        dir = builtins.readDir ./.;
-    in builtins.map (x: ./${x}) (builtins.filter 
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    );
-
-    /*imports = [
-        ./gitlab
-        ./gitea
-        ./traefik
-        ./nginx
-        ./jellyfin
-        ./pihole
-        ./nextcloud
-        ./ntfy
-        ./homeassistant
-        ./rustdesk
-        ./netbird
-        ./keycloak
-        ./ollama
-        ./openwebui
-        ./n8n
-        ./wyoming
-        ./code-server
-        ./novnc
-        ./minecraft
-        #./sandbox
-    ];*/
-}
--- a/system/virtualization/containers/gitea/default.nix
+++ b/system/virtualization/containers/gitea/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {

        options.sysconfig.containers.gitea.enable = lib.options.mkOption {
            type = lib.types.bool;
@@ -32,6 +34,7 @@
                extraFlags = [
                    "--load-credential=dbpass:${config.sops.secrets."gitea/dbpass".path}"
                ];
+                
                config = {

                    systemd.services.secrets_setup = {
@@ -78,6 +81,10 @@
                                ENABLED = true;
                                RUN_AT_START = true;
                            };
+
+                            repository = {
+                                DEFAULT_BRANCH = "master";
+                            };
                        };

                        database = {
@@ -86,6 +93,7 @@
                        };

                    };
+
                    services.openssh = {
                        enable = true;
                        openFirewall = true;
@@ -103,4 +111,5 @@
                };
            };
        };
+    };
 }
--- a/system/virtualization/containers/gitlab/default.nix
+++ b/system/virtualization/containers/gitlab/default.nix
@@ -1,172 +0,0 @@
-{ config, lib, ... }: {
-
-    options.sysconfig.containers.gitlab.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.sysconfig.containers.gitlab.enable {
-
-        sops.secrets = {
-            "gitlab/db_pass" = {};
-            "gitlab/root_pass" = {};
-            "gitlab/secrets/secret" = {};
-            "gitlab/secrets/otp" = {};
-            "gitlab/secrets/db" = {};
-            "gitlab/secrets/jws" = {};
-            "gitlab/oidc/id" = {};
-            "gitlab/oidc/secret" = {};
-        };
-
-        services.openssh.ports = [
-            2222
-        ];
-
-        networking.firewall.allowedTCPPorts = [
-            22
-            2222
-        ];
-
-        containers.gitlab = {
-
-            autoStart = true;
-            privateNetwork = true;
-            hostAddress = "192.168.100.10";
-            localAddress = "192.168.100.16";
-
-            forwardPorts = [
-                {
-                    containerPort = 22;
-                    hostPort = 22;
-                }
-            ];
-
-            bindMounts = {
-                "/etc/gitlab/data" = {
-                    hostPath = "/ssd1/Gitlab/data";
-                    isReadOnly = false;
-                };
-            };
-
-            extraFlags = [
-                "--load-credential=dbpass:${config.sops.secrets."gitlab/db_pass".path}"
-                "--load-credential=rootpass:${config.sops.secrets."gitlab/root_pass".path}"
-                "--load-credential=secret:${config.sops.secrets."gitlab/secrets/secret".path}"
-                "--load-credential=otp:${config.sops.secrets."gitlab/secrets/otp".path}"
-                "--load-credential=db:${config.sops.secrets."gitlab/secrets/db".path}"
-                "--load-credential=jws:${config.sops.secrets."gitlab/secrets/jws".path}"
-                "--load-credential=oidc_id:${config.sops.secrets."gitlab/oidc/id".path}"
-                "--load-credential=oidc_secret:${config.sops.secrets."gitlab/oidc/secret".path}"
-            ];
-            config = {
-
-                systemd.services.secrets_setup = {
-                    wantedBy = [ "gitlab.service" ];
-
-                    serviceConfig = {
-                        LoadCredential = [
-                            "dbpass"
-                            "rootpass"
-                            "secret"
-                            "db"
-                            "otp"
-                            "jws"
-                            "oidc_id"
-                            "oidc_secret"
-                        ];
-                    };
-
-                    script = ''
-                        cat ''${CREDENTIALS_DIRECTORY}/dbpass > /etc/gitlab/dbpass
-                        cat ''${CREDENTIALS_DIRECTORY}/rootpass > /etc/gitlab/rootpass
-                        cat ''${CREDENTIALS_DIRECTORY}/secret > /etc/gitlab/secret
-                        cat ''${CREDENTIALS_DIRECTORY}/db > /etc/gitlab/db
-                        cat ''${CREDENTIALS_DIRECTORY}/otp > /etc/gitlab/otp
-                        cat ''${CREDENTIALS_DIRECTORY}/jws > /etc/gitlab/jws
-                        cat ''${CREDENTIALS_DIRECTORY}/oidc_id > /etc/gitlab/oidc-id
-                        cat ''${CREDENTIALS_DIRECTORY}/oidc_secret > /etc/gitlab/oidc-secret
-
-                        chown gitlab:gitlab /etc/gitlab/*
-                    '';
-                };
-                
-                services.gitlab = {
-                    enable = true;
-                    #https = true;
-                    #port = 443;
-                    host = "gitlab.blunkall.us";
-                    databasePasswordFile = "/etc/gitlab/dbpass";
-                    initialRootPasswordFile = "/etc/gitlab/rootpass";
-
-                    statePath = "/etc/gitlab/data";
-
-                    secrets = {
-                        secretFile = "/etc/gitlab/secret";
-                        otpFile = "/etc/gitlab/otp";
-                        dbFile = "/etc/gitlab/db";
-                        jwsFile = "/etc/gitlab/jws";
-                    };
-
-                    extraConfig = {
-                        gitlab = {
-                            default_project_features = {
-                                builds = false;
-                            };
-                        };
-                        omniauth = {
-                            enabled = true;
-                            auto_sign_in_with_provider = "openid_connect";
-                            allow_single_sign_on = [ "openid_connect" ];
-                            sync_email_from_provider = "openid_connect";
-                            sync_profile_from_provider = [ "openid_connect" ];
-                            sync_profile_attributes = [ "email" ];
-                            auto_link_saml_user = true;
-                            auto_link_user = [ "openid_connect" ];
-                            block_auto_created_users = false;
-                            providers = [
-                                {
-                                    name = "openid_connect";
-                                    label = "Authentik SSO";
-                                    args = {
-                                        name = "openid_connect";
-                                        scope = [ "openid" "profile" "email" ];
-                                        response_type = "code";
-                                        issuer = "https://auth.blunkall.us/application/o/gitlab/";
-                                        discovery = true;
-                                        client_auth_method = "query";
-                                        uid_field = "preferred_username";
-                                        send_scope_to_token_endpoint = true;
-                                        pkce = true;
-                                        client_options = {
-                                            identifier = { _secret = "/etc/gitlab/oidc-id"; };
-                                            secret = { _secret = "/etc/gitlab/oidc-secret"; };
-                                            redirect_uri = "https://gitlab.blunkall.us/users/auth/openid_connect/callback";
-                                        };
-                                    };
-                                }
-                            ];
-                        };
-                    };
-                };
-                services.nginx = {
-                    enable = true;
-                    recommendedProxySettings = true;
-                    virtualHosts = {
-                        "gitlab.blunkall.us" = {
-                            locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket";
-                        };
-                    };
-                };
-
-                services.openssh.enable = true;
-
-                systemd.services.gitlab-backup.environment.BACKUP = "dump";
-
-
-                networking.firewall.allowedTCPPorts = [ 22 80 ];
-
-                system.stateVersion = "24.05";
-            };
-        };
-    };
-}
--- a/system/virtualization/containers/jellyfin/default.nix
+++ b/system/virtualization/containers/jellyfin/default.nix
@@ -1,39 +0,0 @@
-{ config, lib, ... }: {
-
-    options.sysconfig.containers.jellyfin.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.sysconfig.containers.jellyfin.enable {
-
-        containers.jellyfin = {
-
-            autoStart = true;
-            privateNetwork = true;
-            hostAddress = "192.168.100.10";
-            localAddress = "192.168.100.14";
-
-            bindMounts = {
-                "/etc/jellyfin" = {
-                    hostPath = "/ssd1/Jellyfin";
-                    isReadOnly = false;
-                };
-            };
-
-            config = {
-                
-                services.jellyfin = {
-                    
-                    enable = true;
-                    dataDir = "/etc/jellyfin/data";
-                    configDir = "/etc/jellyfin/config";
-                    logDir = "/etc/jellyfin/log";
-                    openFirewall = true;
-                };
-
-                system.stateVersion = "24.05";
-            };
-        };
-    };
-}
--- a/system/virtualization/containers/minecraft/default.nix
+++ b/system/virtualization/containers/minecraft/default.nix
@@ -1,108 +0,0 @@
-{ config, lib, pkgs, nix-minecraft, ... }: {
-
-    options.sysconfig = {
-        containers.minecraft.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-    };
-
-    config = lib.mkIf config.sysconfig.containers.minecraft.enable {
-
-        networking = {
-            firewall = {
-                allowedTCPPorts = [ 25565 ];
-                allowedUDPPorts = [ 25565 ];
-            };
-        };
-                
-        nixpkgs.overlays = [ nix-minecraft.overlay ];
-
-        containers.minecraft = {
-
-            autoStart = true;
-            privateNetwork = true;
-            hostAddress = "192.168.100.10";
-            localAddress = "192.168.100.29";
-
-            forwardPorts = [
-                {
-                    containerPort = 25565;
-                    hostPort = 25565;
-                    protocol = "tcp";
-                }
-                {
-                    containerPort = 25565;
-                    hostPort = 25565;
-                    protocol = "udp";
-                }
-            ];
-
-
-            config = {
-
-                imports = [
-                    nix-minecraft.nixosModules.minecraft-servers
-                ];
-
-                environment.systemPackages = with pkgs; [ tmux ];
-
-                services.minecraft-servers = {
-
-                    enable = true;
-                    eula = true;
-                    openFirewall = true;
-                    dataDir = "/var/lib/mcservers";
-
-                    managementSystem.systemd-socket.enable = true; #temp
-
-                    servers = {
-
-                        vanilla = {
-                            enable = true;
-                            package = pkgs.fabricServers.fabric-1_21_8;
-                            serverProperties = {
-                                server-port = 25565;
-                                gamemode = "survival";
-                                difficulty = 2;
-                                white-list = true;
-                                motd = "Didn't see that coming huh?";
-                            }; 
-                            whitelist = {
-                                "MeasureTwice66" = "a4032062-293d-484d-a790-9f52475836bb";
-                                "651sonic" = "936a3fb0-4548-4557-975b-7794e97a3afc";
-                                "Griffin12_" = "6a1f56d9-f712-4723-a031-e5437a389bb3";
-                            };
-                            autoStart = true;
-                        };
-
-                        modded = {
-                            enable = false;
-#package = pkgs.fabricServers.fabric-1_21_1.override { loaderVersion = "0.16.14"; };
-                            package = pkgs.fabricServers.fabric-1_21_1;
-                            jvmOpts = [ "-Xms8000M" "-Xmx12000M" ];
-                            serverProperties = {
-                                server-port = 25566;
-                                gamemode = "survival";
-                                white-list = true;
-                                allow-flight = true;
-                                motd = "Ex-plo-sion!!!";
-                            };
-                            whitelist = {
-                                "MeasureTwice66" = "a4032062-293d-484d-a790-9f52475836bb";
-                                "651sonic" = "936a3fb0-4548-4557-975b-7794e97a3afc";
-                                "Griffin12_" = "6a1f56d9-f712-4723-a031-e5437a389bb3";
-                            };
-                            autoStart = true;
-                            symlinks = {
-                                "mods" = ./mods;
-                            };
-                        };
-                    };
-                };
-
-                system.stateVersion = "25.05";
-            };
-        };
-    };
-}
--- a/system/virtualization/containers/nextcloud/default.nix
+++ b/system/virtualization/containers/nextcloud/default.nix
@@ -1,81 +0,0 @@
-{ config, lib, ... }: {
-
-    options.sysconfig.containers.nextcloud.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.sysconfig.containers.nextcloud.enable {
-
-        sops.secrets."nextcloud/pass" = {};
-
-        containers.nextcloud = {
-
-            autoStart = true;
-            privateNetwork = true;
-            hostAddress = "192.168.100.10";
-            localAddress = "192.168.100.15";
-
-            bindMounts = {
-
-                "/var/lib/nextcloud" = {
-                    hostPath = "/ssd1/Nextcloud/data";
-                    isReadOnly = false;
-                };
-
-            };
-
-            extraFlags = [
-                "--load-credential=nextcloud-admin-pass:${config.sops.secrets."nextcloud/pass".path}"
-            ];
-
-            config = { config, lib, pkgs, ... }: {
-
-                systemd.services.secrets_setup = {
-                    wantedBy = [ "nextcloud-setup.service" ];
-
-                    serviceConfig = {
-                        LoadCredential = [
-                            "nextcloud-admin-pass"
-                        ];
-                    };
-
-                    script = ''
-                        cat $CREDENTIALS_DIRECTORY/nextcloud-admin-pass > /etc/nextcloud-admin-pass
-                        chown nextcloud:nextcloud /etc/nextcloud-admin-pass
-                    '';
-                };
-
-                networking.firewall.allowedTCPPorts = [ 80 443 ];
-                services.nginx.virtualHosts."192.168.100.15".listen = [ { addr = "0.0.0.0"; port = 80; } ];
-                services.nextcloud = {
-                    enable = true;
-                    package = pkgs.nextcloud32;
-                    hostName = "192.168.100.15";
-                    config = {
-                        adminpassFile = "/etc/nextcloud-admin-pass";
-                        adminuser = "root";
-                        dbtype = "mysql";
-                    };
-                    https = true;
-                    home = "/var/lib/nextcloud";
-                    appstoreEnable = true;
-                    extraApps = with config.services.nextcloud.package.packages.apps; {
-                        inherit mail contacts calendar tasks user_oidc; 
-                        inherit impersonate end_to_end_encryption notes spreed music memories phonetrack;
-                    };
-                    extraAppsEnable = true;
-                    settings = {
-                        overwriteprotocol = "https";
-                        trusted_domains = [ "nextcloud.esotericbytes.com" ];
-                        trusted_proxies = [ "192.168.100.11" ];
-                        default_phone_region = "US";
-                    };
-                    database.createLocally = true;
-                };
-
-                system.stateVersion = "24.05";
-            };
-        };
-    };
-}
--- a/system/virtualization/containers/nginx/default.nix
+++ b/system/virtualization/containers/nginx/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {

        options.sysconfig.containers."esotericbytes.com".enable = lib.mkOption {
            type = lib.types.bool;
@@ -40,4 +42,5 @@
                };
            };
        };
+    };
 }
--- a/system/virtualization/containers/novnc/default.nix
+++ b/system/virtualization/containers/novnc/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {

        options.sysconfig.containers.novnc.enable = lib.mkOption {
            type = lib.types.bool;
@@ -49,4 +51,5 @@
                };
            };
        };
+    };
 }
--- a/system/virtualization/containers/ntfy/default.nix
+++ b/system/virtualization/containers/ntfy/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {

        options.sysconfig.containers.ntfy.enable = lib.mkOption {
            type = lib.types.bool;
@@ -40,4 +42,5 @@
                };
            };
        };
+    };
 }
--- a/system/virtualization/containers/openwebui/default.nix
+++ b/system/virtualization/containers/openwebui/default.nix
@@ -1,39 +0,0 @@
-{ config, lib, nixpkgs-us, ... }: {
-
-    options = {
-        sysconfig.containers.openwebui.enable = lib.options.mkOption {
-            type = lib.types.bool;
-            default = false;
-        };
-    };
-
-    config = lib.mkIf config.sysconfig.containers.openwebui.enable {
-        
-        containers.openwebui = {
-
-            autoStart = true;
-            privateNetwork = true;
-            hostAddress = "192.168.100.10";
-            localAddress = "192.168.100.33";
-
-            config = {
-
-                services.open-webui = {
-                    enable = true;
-                    package = let 
-                        pkgs-us = import nixpkgs-us {
-                            system = "x86_64-linux";
-                            config.allowUnfree = true;
-                        }; 
-                    in pkgs-us.open-webui;
-
-                    openFirewall = true;
-                    host = "0.0.0.0";
-                };
-
-                system.stateVersion = "25.05";
-            };
-        };
-
-    };
-}
--- a/system/virtualization/containers/rustdesk/default.nix
+++ b/system/virtualization/containers/rustdesk/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {

        options.sysconfig.containers.rustdesk.enable = lib.options.mkOption {
            type = lib.types.bool;
@@ -82,4 +84,5 @@
                };
            };
        };
+    };
 }
--- a/system/virtualization/containers/sandbox/default.nix
+++ b/system/virtualization/containers/sandbox/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, self, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, self, ... }: {

        options.sysconfig.containers.sandbox.enable = lib.mkOption {
            type = lib.types.bool;
@@ -74,6 +76,7 @@
                };


+            };
        };
    };
 }
--- a/system/virtualization/containers/traefik/default.nix
+++ b/system/virtualization/containers/traefik/default.nix
@@ -1,292 +0,0 @@
-{ config, lib, ... }: {
-    
-    options.sysconfig.containers.traefik.enable = lib.options.mkOption {
-        type = lib.types.bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.sysconfig.containers.traefik.enable {
-            
-        networking = {
-            hosts."192.168.100.11" = [
-
-                "esotericbytes.com"
-                "*.esotericbytes.com"
-            ];
-
-            firewall.allowedTCPPorts = [ 22 80 443 ];
-
-            nat.internalInterfaces = [ "ve-traefik" ];
-        };
-
-        containers.traefik = {
-            
-            autoStart = true;
-            privateNetwork = true;
-            hostAddress = "192.168.100.10";
-            localAddress = "192.168.100.11";
-            forwardPorts = [
-                {
-                    containerPort = 81;
-                    hostPort = 80;
-                }
-                {
-                    containerPort = 444;
-                    hostPort = 443;
-                }
-            ];
-
-            bindMounts = {
-                "/etc/traefik/data" = {
-                    hostPath = "/ssd1/Traefik/data";
-                    isReadOnly = false;
-                };
-
-                "/var/run/docker.sock" = lib.mkIf config.sysconfig.docker.enable {
-                    hostPath = "/run/docker.sock";
-                    isReadOnly = false;
-                };
-            };
-
-            config = {
-                
-                environment.etc."resolv.conf" = {
-                    enable = true;
-                    text = ''
-                        nameserver 1.1.1.1
-                        nameserver 1.0.0.1
-                        options edns0
-                        '';
-
-                    user = "root";
-                    mode = "0664";
-                };
-
-                #virtualisation.docker.enable = lib.mkIf config.sysconfig.docker.enable true;
-
-                users.groups."docker" = lib.mkIf config.sysconfig.docker.enable {
-                    name = "docker";
-                    gid = 131;
-                    members = [
-                        "traefik"
-                    ];
-                };
-
-                services.traefik = {
-
-                    enable = true;
-
-                    group = lib.mkIf config.sysconfig.docker.enable "docker";
-
-                    dataDir = "/etc/traefik/data";
-
-                    environmentFiles = [
-                        "/etc/traefik/data/traefik.env"
-                    ];
-
-                    staticConfigOptions = {
-                        serversTransport.insecureSkipVerify = true;
-                        api = {
-                            dashboard = true;
-                            debug = true;
-                        };
-                        global = {
-                            checknewversion = false;
-                            sendanonymoususage = false;
-                        };
-
-                        providers.docker = lib.mkIf config.sysconfig.docker.enable {};
-
-                        entryPoints = {
-                            
-                            web = {
-                                address = ":81";
-                                http.redirections.entryPoint = {
-                                    to = "websecure";
-                                    scheme = "https";
-                                };
-                            };
-
-                            websecure = {
-                                address = ":444";
-                                asDefault = true;
-                                http.tls = {
-                                    certResolver = "cloudflare";
-                                    domains = {
-                                        main = "esotericbytes.com";
-                                        sans = [ 
-                                            "*.esotericbytes.com" 
-                                        ];
-                                    };
-                                };
-                            };
-
-                            local = {
-                                address = ":80";
-                                http.redirections.entryPoint = {
-                                    to = "localsecure";
-                                    scheme = "https";
-                                };
-                            };
-
-                            localsecure = {
-                                address = ":443";
-                                asDefault = true;
-                                http.tls = {
-                                    certResolver = "cloudflare";
-                                    domains = {
-                                        main = "esotericbytes.com";
-                                        sans = [ 
-                                            "*.esotericbytes.com" 
-                                        ];
-                                    };
-                                };
-                            };
-                        };
-                        log = {
-                            level = "INFO";
-                            filePath = "/etc/traefik/data/logs/traefik.log";
-                            format = "json";
-                        };
-                        certificatesResolvers = {
-                            cloudflare = {
-                                acme = {
-                                    email = "nathanblunkall5@gmail.com";
-                                    storage = "/etc/traefik/data/acme.json";
-                                    keyType = "EC256";
-                                    dnsChallenge = {
-                                        provider = "cloudflare";
-                                        resolvers = [ "1.1.1.1:53" "1.0.0.1:53" ];
-                                    };
-                                };
-                            };
-                        };
-                    };
-
-                    dynamicConfigOptions = {
-                        http = {
-                            routers = {
-                                homepageSecure = {
-                                    entryPoints = [ "websecure" "localsecure" ];
-                                    rule = "Host(`esotericbytes.com`) || Host(`www.esotericbytes.com`)";
-                                    service = "homepage";
-                                    tls.certResolver = "cloudflare";
-                                };
-                                /*remote = {
-                                    entryPoints = [ "websecure" ];
-                                    rule = "Host(`remote.esotericbytes.com`)";
-                                    service = "novnc";
-                                    tls.certResolver = "cloudflare";
-                                    #middlewares = [ "authentik" ];
-                                };*/
-                                /*homeassistant = {
-                                    entryPoints = [ "localsecure" ];
-                                    rule = "Host(`hass.esotericbytes.com`)";
-                                    service = "homeassistant";
-                                    tls.certResolver = "cloudflare";
-                                };*/
-                                jellyfin = {
-                                    entryPoints = [ "websecure" "localsecure" ];
-                                    rule = "Host(`jellyfin.esotericbytes.com`)";
-                                    service = "jellyfin";
-                                    tls.certResolver = "cloudflare";
-                                };
-
-                                /*gitlab = {
-                                    entryPoints = [ "websecure" ];
-                                    rule = "Host(`gitlab.esotericbytes.com`)";
-                                    service = "gitlab";
-                                    tls.certResolver = "cloudflare";
-                                };*/
-                                gitea = {
-                                    entryPoints = [ "websecure" "localsecure" ];
-                                    rule = "Host(`gitea.esotericbytes.com`)";
-                                    service = "gitea";
-                                    tls.certResolver = "cloudflare";
-                                };
-                                nextcloud = {
-                                    entryPoints = [ "websecure" "localsecure" ];
-                                    rule = "Host(`nextcloud.esotericbytes.com`)";
-                                    service = "nextcloud";
-                                    tls.certResolver = "cloudflare";
-                                    middlewares = [
-                                        "nextcloud_redirectregex"
-                                    ];
-                                };
-                                traefik = {
-                                    entryPoints = [ "localsecure" ];
-                                    rule = "Host(`traefik.esotericbytes.com`)";
-                                    service = "api@internal";
-                                    tls.certResolver = "cloudflare";
-                                    #middlewares = [ "authentik" ];
-                                };
-                                /*ntfy = {
-                                    entryPoints = [ "websecure" ];
-                                    rule = "Host(`ntfy.esotericbytes.com`)";
-                                    service = "ntfy";
-                                    tls.certResolver = "cloudflare";
-                                };*/
-
-                                openwebui = {
-                                    entryPoints = [ "localsecure" ];
-                                    rule = "Host(`ai.esotericbytes.com`)";
-                                    service = "openwebui";
-                                    tls.certResolver = "cloudflare";
-                                };
-                                
-                                code-server = {
-                                    entryPoints = [ "localsecure" ];
-                                    rule = "Host(`code.esotericbytes.com`)";
-                                    service = "code-server";
-                                    tls.certResolver = "cloudflare";
-                                };
-                            };
-
-                            middlewares = {
-
-                                nextcloud_redirectregex.redirectregex = {
-                                    permanent = true;
-                                    regex = "https://nextcloud.esotericbytes.com/.well-known/(?:card|cal)dav";
-                                    replacement = "https://nextcloud.esotericbytes.com/remote.php/dav";
-                                };
-                            };
-
-                            services = {
-                                #gitlab.loadBalancer.servers = [ { url = "http://192.168.100.16:80"; } ];
-                                
-                                gitea.loadBalancer.servers = [ { url = "http://192.168.100.20:3000"; } ];
-
-                                homepage.loadBalancer.servers = [ { url = "http://192.168.100.13:80"; } ];
-
-                                jellyfin.loadBalancer.servers = [ { url = "http://192.168.100.14:8096"; } ];
-
-                                #novnc.loadBalancer.servers = [ { url = "http://192.168.100.10:6080"; } ];
-
-                                nextcloud.loadBalancer.servers = [ { url = "http://192.168.100.15:80"; } ];
-
-                                #ntfy.loadBalancer.servers = [ { url = "http://192.168.100.19"; } ];
-                                
-                                openwebui.loadBalancer.servers = [ { url = "http://192.168.100.33:8080"; } ];
-                                
-                                code-server.loadBalancer.servers = [ { url = "http://192.168.100.31:4444"; } ];
-
-                                /*homeassistant.loadBalancer.servers = [ { url = "http://192.168.100.25:8123"; } ];*/
-                            };
-                        };
-                    };
-                };
-
-                networking = {
-                    firewall = {
-                        allowedTCPPorts = [ 80 443 81 444 ];
-                        allowedUDPPorts = [ 80 443 81 444 ];
-                    };
-
-                    useHostResolvConf = false;
-                };
-
-                system.stateVersion = "24.05";
-            };
-        };
-    };
-}
--- a/system/virtualization/containers/wyoming/default.nix
+++ b/system/virtualization/containers/wyoming/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {

        options.sysconfig.containers.wyoming = {
            enable = lib.options.mkOption {
@@ -128,4 +130,5 @@
            };

        };
+    };
 }
--- a/system/virtualization/default.nix
+++ b/system/virtualization/default.nix
@@ -1,9 +0,0 @@
-{ ... }: {
-
-    imports = let 
-        dir = builtins.readDir ./.;
-    in builtins.map (x: ./${x}) (builtins.filter 
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    );
-}
--- a/system/virtualization/docker/authentik/default.nix
+++ b/system/virtualization/docker/authentik/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: let
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: let

    hostPort = 9005;

@@ -95,6 +97,12 @@ in {
                    "traefik.http.routers.${name}.tls.certResolver" = "cloudflare";

                    "traefik.http.services.${name}.loadbalancer.server.url" = "http://192.168.101.1:${builtins.toString hostPort}";
+
+
+                    "traefik.http.middlewares.authentik.forwardauth.address" = "https://auth.esotericbytes.com/outpost.goauthentik.io/auth/traefik";
+                    "traefik.http.middlewares.authentik.forwardauth.trustForwardHeader" = "true";
+                    "traefik.http.middlewares.authentik.forwardauth.authResponseHeaders" = "X-authentik-username,X-authentik-groups,X-authentik-entitlements,X-authentik-email,X-authentik-name,X-authentik-uid,X-authentik-jwt,X-authentik-meta-jwks,X-authentik-meta-outpost,X-authentik-meta-provider,X-authentik-meta-app,X-authentik-meta-version";
+
                };
                volumes = [
                    "/etc/Authentik/custom-templates:/templates:rw"
@@ -228,4 +236,5 @@ in {
                wantedBy = [ "multi-user.target" ];
            };
        };
+    };
 }
--- a/system/virtualization/docker/default.nix
+++ b/system/virtualization/docker/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {

        options.sysconfig.docker = {
            enable = with lib; mkOption {
@@ -12,13 +14,6 @@
            };
        };

-    imports = let 
-        dir = builtins.readDir ./.;
-    in builtins.map (x: ./${x}) (builtins.filter 
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    );
-
        config = lib.mkIf config.sysconfig.docker.enable {

            networking.nat.internalInterfaces = [ "docker0" "docker-main" ];
@@ -58,4 +53,6 @@
                wantedBy = [ "multi-user.target" ];
            };
        };
+    };
 }
+
--- a/system/virtualization/docker/gitea/default.nix
+++ b/system/virtualization/docker/gitea/default.nix
@@ -1 +1,154 @@
-{}
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: let
+
+    subdomain = "gitea";
+
+    name = "gitea";
+
+    in {
+
+        options.sysconfig.docker."${name}".enable = with lib; mkOption {
+            type = with types; bool;
+            default = false;
+        };
+
+        config = lib.mkIf (config.sysconfig.docker."${name}".enable && config.sysconfig.docker.enable) {
+
+
+            virtualisation.oci-containers.containers."${name}" = {
+                image = "docker.gitea.com/gitea:1.25.4";
+
+# unstable, waiting for 26.05
+#pull = "newer";
+
+                hostname = "${subdomain}.esotericbytes.com";
+
+                networks = [
+                    "docker-main"
+                ];
+
+                labels = {
+                    "traefik.enable" = "true";
+                    "traefik.http.routers.${name}.entrypoints" = "localsecure";
+                    "traefik.http.routers.${name}.rule" = "Host(`${subdomain}.esotericbytes.com`)";
+                    "traefik.http.routers.${name}.service" = "${name}";
+                    "traefik.http.routers.${name}.tls.certResolver" = "cloudflare";
+
+                    "traefik.http.services.${name}.loadbalancer.server.port" = "3000";
+
+
+                    "traefik.tcp.routers.${name}-ssh.entrypoints" = "gitea-ssh";
+                    "traefik.tcp.routers.${name}-ssh.rule" = "HostSNI(`*`)";
+                    "traefik.tcp.routers.${name}-ssh.service" = "${name}-ssh";
+
+                    "traefik.tcp.services.${name}-ssh.loadbalancer.server.port" = "22";
+                };
+
+                ports = [
+                ];
+
+                extraOptions = [
+                    "--ip=192.168.101.20"
+                ];
+
+                volumes = [
+                    "vol_gitea:/data"
+                ];
+
+                environment = {
+                };
+            };
+
+            virtualisation.oci-containers.containers."${name}-db" = {
+                image = "docker.io/library/postgres:14";
+
+# unstable, waiting for 26.05
+#pull = "newer";
+
+                hostname = "${name}-db";
+
+                networks = [
+                    "docker-main"
+                ];
+
+                labels = {
+                };
+
+                ports = [
+                ];
+
+                extraOptions = [
+                    "--ip=192.168.101.21"
+                ];
+
+                volumes = [
+                    "/etc/gitea/db:/var/lib/postgresql/data"
+                ];
+
+                environment = {
+                };
+            };
+
+            systemd.services."docker-gitea" = {
+                serviceConfig = {
+                    Restart = lib.mkOverride 90 "always";
+                    RestartMaxDelaySec = lib.mkOverride 90 "1m";
+                    RestartSec = lib.mkOverride 90 "100ms";
+                    RestartSteps = lib.mkOverride 90 9;
+                };
+                after = [
+                    "docker-network-setup.service"
+                        "docker-volume-gitea.service" 
+                        "docker-gitea-db.service" 
+                ];
+                requires = [
+                    "docker-network-setup.service"
+                        "docker-volume-gitea.service" 
+                        "docker-gitea-db.service" 
+                ];
+                partOf = [
+                    "docker-compose-gitea-root.target"
+                ];
+                wantedBy = [
+                    "docker-compose-gitea-root.target"
+                ];
+            };
+
+            systemd.services."docker-gitea-db" = {
+                serviceConfig = {
+                    Restart = lib.mkOverride 90 "always";
+                    RestartMaxDelaySec = lib.mkOverride 90 "1m";
+                    RestartSec = lib.mkOverride 90 "100ms";
+                    RestartSteps = lib.mkOverride 90 9;
+                };
+                after = [
+                    "docker-network-setup.service"
+                ];
+                requires = [
+                    "docker-network-setup.service"
+                ];
+                partOf = [
+                    "docker-compose-gitea-root.target"
+                ];
+                wantedBy = [
+                    "docker-compose-gitea-root.target"
+                ];
+            };
+
+            systemd.services."docker-volume-gitea" = {
+                path = [ pkgs.docker ];
+                serviceConfig = {
+                    Type = "oneshot";
+                    RemainAfterExit = true;
+                };
+                script = ''
+                    docker volume inspect vol_gitea || docker volume create vol_gitea --driver=local
+                    '';
+                partOf = [ "docker-compose-gitea-root.target" ];
+                wantedBy = [ "docker-compose-gitea-root.target" ];
+            };
+
+        };
+    };
+}
--- a/system/virtualization/docker/home-assistant/default.nix
+++ b/system/virtualization/docker/home-assistant/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, ... }: let
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: let

    subdomain = "hass";

@@ -55,4 +57,5 @@ in {
                ];
            };
        };
+    };
 }
--- a/system/virtualization/docker/jellyfin/default.nix
+++ b/system/virtualization/docker/jellyfin/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: let
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: let

    subdomain = "watch";

@@ -114,4 +116,5 @@ in {
            };

        };
+    };
 }
--- a/system/virtualization/docker/n8n/default.nix
+++ b/system/virtualization/docker/n8n/default.nix
@@ -1,6 +1,6 @@
-{ config, lib, ... }: let
+{ ... }: {

-    hostPort = 9004;
+    flake.nixosModules.default = { config, lib, pkgs, ... }: let

    subdomain = "n8n";

@@ -16,12 +16,6 @@ in {
        config = lib.mkIf (config.sysconfig.docker."${name}".enable && config.sysconfig.docker.enable) {


-        networking.firewall.interfaces = {
-            "ve-traefik" = {
-                allowedTCPPorts = [ hostPort ];
-            };
-        };
-
            virtualisation.oci-containers.containers."${name}" = {
                image = "docker.n8n.io/n8nio/n8n";

@@ -41,7 +35,6 @@ in {
                    "traefik.http.routers.${name}.service" = "${name}";
                    "traefik.http.routers.${name}.tls.certResolver" = "cloudflare";

-                #"traefik.http.services.${name}.loadbalancer.server.url" = "http://192.168.100.10:${builtins.toString hostPort}";
                    "traefik.http.services.${name}.loadbalancer.server.port" = "5678";
                };

@@ -70,5 +63,43 @@ in {
                    N8N_SECURE_COOKIE = "false";
                };
            };
+
+            systemd.services."docker-n8n" = {
+                serviceConfig = {
+                    Restart = lib.mkOverride 90 "always";
+                    RestartMaxDelaySec = lib.mkOverride 90 "1m";
+                    RestartSec = lib.mkOverride 90 "100ms";
+                    RestartSteps = lib.mkOverride 90 9;
+                };
+                after = [
+                    "docker-network-setup.service"
+                        "docker-volume-n8n.service" 
+                ];
+                requires = [
+                    "docker-network-setup.service"
+                        "docker-volume-n8n.service" 
+                ];
+                partOf = [
+                    "docker-compose-n8n-root.target"
+                ];
+                wantedBy = [
+                    "docker-compose-n8n-root.target"
+                ];
+            };
+
+            systemd.services."docker-volume-n8n" = {
+                path = [ pkgs.docker ];
+                serviceConfig = {
+                    Type = "oneshot";
+                    RemainAfterExit = true;
+                };
+                script = ''
+                    docker volume inspect vol_n8n || docker volume create vol_n8n --driver=local
+                    '';
+                partOf = [ "docker-compose-n8n-root.target" ];
+                wantedBy = [ "docker-compose-n8n-root.target" ];
+            };
+
+        };
    };
 }
--- a/system/virtualization/docker/netbird/default.nix
+++ b/system/virtualization/docker/netbird/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {

        options.sysconfig.docker.netbird.enable = with lib; mkOption {
            type = with types; bool;
@@ -226,4 +228,5 @@
                wantedBy = [ "multi-user.target" ];
            };
        };
+    };
 }
--- a/system/virtualization/docker/nextcloud/default.nix
+++ b/system/virtualization/docker/nextcloud/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: let
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: let

    subdomain = "cloud";

@@ -112,4 +114,5 @@ in {
            };

        };
+    };
 }
--- a/system/virtualization/docker/ollama/default.nix
+++ b/system/virtualization/docker/ollama/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: let
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: let

    hostPort = 11434;

@@ -62,7 +64,7 @@ in {

                extraOptions = lib.mkIf config.sysconfig.docker.nvidia [
                    "--device=nvidia.com/gpu=all"
-                "--ip=192.168.101.6"
+                        "--ip=192.168.101.22"
                ];

                environment = {
@@ -70,4 +72,5 @@ in {
                };
            };
        };
+    };
 }
--- a/system/virtualization/docker/openwebui/default.nix
+++ b/system/virtualization/docker/openwebui/default.nix
@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: let
+{ ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: let

    subdomain = "ai";

@@ -93,4 +95,5 @@ in {
            };

        };
+    };
 }
--- a/system/virtualization/docker/passbolt/docker-compose.nix-txt
+++ b/system/virtualization/docker/passbolt/docker-compose.nix-txt
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Nathan	c8cfd433ae	test	2026-03-06 19:39:21 -06:00
Nathan	60dd114bcc	update aurora	2026-03-06 19:35:52 -06:00
Nathan	ac12242060	update aurora	2026-03-06 19:31:03 -06:00
Nathan	c3f12243d8	Begin Dendritic rewrite	2026-03-06 19:17:00 -06:00
Nathan	e296f298b1	Begin Dendritic rewrite	2026-03-06 19:07:55 -06:00
Nathan	f656be3dfb	Begin Dendritic rewrite	2026-03-06 19:05:37 -06:00
Nathan	eb5b08c8f0	Begin Dendritic rewrite	2026-03-06 18:46:38 -06:00
Nathan	fa9ca0ec63	Begin Dendritic rewrite	2026-03-06 18:37:21 -06:00
Nathan	fd10360294	Begin Dendritic rewrite	2026-03-06 18:27:39 -06:00
Nathan	0237820306	Begin Dendritic rewrite	2026-03-06 18:26:41 -06:00
Nathan	64b6b6b763	Begin Dendritic rewrite	2026-03-06 18:23:19 -06:00
Nathan	78b1b26b91	Begin Dendritic rewrite	2026-03-06 16:34:10 -06:00
Nathan	44eb6492f2	Begin Dendritic rewrite	2026-03-06 16:32:07 -06:00
Nathan	597f51e7b2	Begin Dendritic rewrite	2026-03-06 16:25:23 -06:00
Nathan	c1684a80f7	Begin Dendritic rewrite	2026-03-06 16:24:53 -06:00
Nathan	f3a90a0fe8	test	2026-02-28 19:01:49 -06:00
Nathan	11089070ba	test	2026-02-28 18:05:10 -06:00
Nathan	8697469f5f	add authentik middleware	2026-02-28 17:56:12 -06:00
Nathan	fa6abcfd98	add ssh key	2026-02-28 17:26:54 -06:00
Nathan	7f0629f313	work on docker gitea	2026-02-25 09:03:17 -06:00
Nathan	1a088bc501	no nextcloud for now	2026-02-20 21:35:52 -06:00
Nathan	0f70cf9bbc	add localsend	2026-02-14 18:02:53 -06:00
Nathan	fbf6864350	ollama ip	2026-02-04 00:15:51 -06:00