latest hyprland

.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

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"
+    ];
+}

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769428758,
+        "lastModified": 1772292445,
-        "narHash": "sha256-0G/GzF7lkWs/yl82bXuisSqPn6sf8YGTnbEdFOXvOfU=",
+        "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": 1772902533,
+        "narHash": "sha256-h88e8qZqWr7am6xZMgFHzs6iiZCXaHPYcrf0wWYLoE4=",
+        "ref": "refs/heads/master",
+        "rev": "ff97c41b022482beda79c9a0a835a94b371b78e0",
+        "revCount": 6,
+        "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,
+        "lastModified": 1772699110,
-        "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=",
+        "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,
+        "lastModified": 1772824881,
-        "narHash": "sha256-9Sqq/hxq8ZDLRSzu+edn0OfWG+FAPWFpwMKaJobeLec=",
+        "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,
+        "lastModified": 1772633058,
-        "narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=",
+        "narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826",
+        "rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865",
         "type": "github"
       },
       "original": {
@@ -235,11 +294,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769284023,
+        "lastModified": 1770511807,
-        "narHash": "sha256-xG34vwYJ79rA2wVC8KFuM8r36urJTG6/csXx7LiiSYU=",
+        "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,
+        "lastModified": 1772891233,
-        "narHash": "sha256-rQ4no/+LHuHlqDbJopj6fgS9GUsv1NSycrVhIoLPnbs=",
+        "narHash": "sha256-+cnUpHEmPxu0IizoeLWT/WB7LX5+f5NRShZ0zzpHFOs=",
         "ref": "refs/heads/main",
-        "rev": "30756d871845a6058a840642ab1a4c3979f6d782",
+        "rev": "73fca55e7c9dd19222c8c0cc331ddebf4c4bfddf",
-        "revCount": 6859,
+        "revCount": 7000,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -367,11 +426,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767983607,
+        "lastModified": 1771866172,
-        "narHash": "sha256-8C2co8NYfR4oMOUEsPROOJ9JHrv9/ktbJJ6X1WsTbXc=",
+        "narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "d4037379e6057246b408bbcf796cf3e9838af5b2",
+        "rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41",
         "type": "github"
       },
       "original": {
@@ -444,11 +503,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766253372,
+        "lastModified": 1771271487,
-        "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=",
+        "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9",
+        "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d",
         "type": "github"
       },
       "original": {
@@ -469,11 +528,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763640274,
+        "lastModified": 1770501770,
-        "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=",
+        "narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671",
+        "rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40",
         "type": "github"
       },
       "original": {
@@ -498,11 +557,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769202094,
+        "lastModified": 1771606233,
-        "narHash": "sha256-gdJr/vWWLRW85ucatSjoBULPB2dqBJd/53CZmQ9t91Q=",
+        "narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=",
         "owner": "hyprwm",
         "repo": "hyprwire",
-        "rev": "a45ca05050d22629b3c7969a926d37870d7dd75c",
+        "rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a",
         "type": "github"
       },
       "original": {
@@ -511,33 +570,43 @@
         "type": "github"
       }
     },
-    "nix-minecraft": {
+    "import-tree": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "nixpkgs": "nixpkgs_2",
-        "systems": "systems_2"
-      },
       "locked": {
-        "lastModified": 1770000653,
+        "lastModified": 1772344373,
-        "narHash": "sha256-QO/twGynxjOSUDtxbqJLshc/Q5/wImLH5O6KV2p9eoE=",
+        "narHash": "sha256-OQQ1MhB9t1J71b2wxRRTdH/Qd8UGG0p+dGspfCf5U1c=",
-        "owner": "Infinidoge",
+        "owner": "vic",
-        "repo": "nix-minecraft",
+        "repo": "import-tree",
-        "rev": "6a2ddb643aaf7949caa6158e718c5efc3dda7dc1",
+        "rev": "10fda59eee7d7970ec443b925f32a1bc7526648c",
         "type": "github"
       },
       "original": {
-        "owner": "Infinidoge",
+        "owner": "vic",
-        "repo": "nix-minecraft",
+        "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,
+        "lastModified": 1772542754,
-        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
+        "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,
+        "lastModified": 1772624091,
-        "narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=",
+        "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137",
+        "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353",
         "type": "github"
       },
       "original": {
@@ -580,11 +679,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1769461804,
+        "lastModified": 1772433332,
-        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
+        "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
+        "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705",
         "type": "github"
       },
       "original": {
@@ -596,11 +695,27 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1770056022,
+        "lastModified": 1772198003,
-        "narHash": "sha256-yvCz+Qmci1bVucXEyac3TdoSPMtjqVJmVy5wro6j/70=",
+        "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",
+        "flake-parts": "flake-parts_3",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "nixvim": "nixvim_2"
       },
       "locked": {
@@ -664,9 +779,9 @@
     },
     "nixvim_2": {
       "inputs": {
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts_4",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_6",
-        "systems": "systems_3"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1769644746,
@@ -692,11 +807,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769069492,
+        "lastModified": 1772024342,
-        "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=",
+        "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",
+        "import-tree": "import-tree_2",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "nixpkgs-us": "nixpkgs-us",
         "nixvim": "nixvim",
         "sops-nix": "sops-nix"
@@ -725,11 +842,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769921679,
+        "lastModified": 1772495394,
-        "narHash": "sha256-twBMKGQvaztZQxFxbZnkg7y/50BW9yjtCBWwdjtOZew=",
+        "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": [

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: {
+    outputs = { ... } @ inputs: 
-
+    inputs.flake-parts.lib.mkFlake { inherit inputs; }
-        profiles = let 
+    (inputs.import-tree [ 
-            dir = builtins.readDir ./profiles;
+        ./profiles 
-            filtered = builtins.filter (x: dir.${x} == "directory") (builtins.attrNames dir);
+        ./homes 
-        in (builtins.listToAttrs 
+        ./machines 
-            (builtins.map 
-                (name: ({
-                    inherit name;
-                        
-                    value = { ... }: {
-                        imports = [
         ./system 
-                            ./profiles/${name}
+        ./templates/default.nix
-                        ];
+        ./flake-parts.nix
-                    };
+    ]);
-                })) 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)
-               );
-    };
 }

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;
-                };
-            };
-        };
-    };
-}

homes/nathan/home-manager/default.nix

@@ -1,11 +1,8 @@
-{ config, lib, pkgs, inputs, ... }: {
+{ inputs, ... }: {
 
-    imports = let 
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
-        dir = builtins.readDir ./.;
+
-    in (builtins.map (x: ./${x}) (builtins.filter 
+        imports = [
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    )) ++ [
             inputs.sops-nix.homeManagerModules.sops
         ];
 
@@ -47,9 +44,10 @@
                 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;
                 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;
@@ -85,7 +83,7 @@
                 defaultSopsFile = ./secrets.yaml;
                 defaultSopsFormat = "yaml";
 
-            #secrets."remoteBuildKey" = {};
+#secrets."remoteBuildKey" = {};
             };
 
             services.mpris-proxy.enable = true;
@@ -111,4 +109,5 @@
             };
 
         };
+    };
 }

homes/nathan/home-manager/dotfiles/default.nix

@@ -1,12 +1,13 @@
-{ config, lib, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, ... }: {
 
         home.file = {
             ".config/hypr" = lib.mkIf config.homeconfig.hyprland.enable { source = ./hypr; recursive = true; };
-		".config/hyprpanel" = lib.mkIf config.homeconfig.hyprpanel.enable { source = ./hyprpanel; recursive = true; };
             ".config/wal/templates" = lib.mkIf config.homeconfig.wal.enable { source = ./wal/templates; recursive = true; };
             ".config/ohmyposh" = { source = ./ohmyposh; recursive = true; };
-		".config/quickshell" = lib.mkIf config.homeconfig.quickshell.enable { source = ./quickshell; recursive = true; };
             "Pictures/Wallpaper" = lib.mkIf config.homeconfig.graphical { source = ./Wallpaper; recursive = true; };
         };
 
+    };
 }

homes/nathan/home-manager/dotfiles/hypr/main.conf

@@ -10,7 +10,7 @@
 #                                                #
 #------------------------------------------------#
 
-exec-once = hyprrun onSystemStart
+exec-once = onSystemStart
 
 # Some default env vars.
 env = XCURSOR_SIZE,16
@@ -48,7 +48,7 @@ general {
         col.active_border = $color1 $color5 100deg
         col.inactive_border = $color0
 
-        layout = master
+        layout = scrolling
 }
 decoration { # See https://wiki.hyprland.org/Configuring/Variables/ for more 
 
@@ -77,7 +77,7 @@ animations {
         animation = border, 1, 10, default
         animation = borderangle, 1, 8, default
         animation = fade, 1, 7, default
-        animation = workspaces, 1, 6, default
+        animation = workspaces, 1, 6, default, slidevert
 }
 
 
@@ -93,6 +93,11 @@ master {
         new_status = "master"
 }
 
+scrolling {
+    column_width = 0.7
+    direction = "right"
+}
+
 misc {
         disable_hyprland_logo = false
         disable_splash_rendering = true
@@ -107,11 +112,11 @@ ecosystem {
 # Binds
 $mainMod = ALT
 
-bind = $mainMod SHIFT, E, exec, colorPrefix hyprrun kitty
+bind = $mainMod SHIFT, E, exec, colorPrefix kitty
 
-bind = $mainMod, B, exec, hyprrun firefox
+bind = $mainMod, B, exec, firefox
 
-bind = $mainMod SHIFT, B, exec, hyprrun firefox --private-window
+bind = $mainMod SHIFT, B, exec, firefox --private-window
 
 bind = $mainMod, Q, killactive,
 
@@ -119,20 +124,20 @@ bind = $mainMod, Q, killactive,
 
 #bind = $mainMod SHIFT, R, exec, colorPrefix kitty -e _homeRebuild
 
-bind = $mainMod, F, exec, hyprrun thunar
+bind = $mainMod, F, exec, thunar
 bind = $mainMod SHIFT, F, fullscreen
 
-bind = $mainMod SHIFT, semicolon, exec, colorPrefix hyprrun kitty -e lf
+bind = $mainMod SHIFT, semicolon, exec, colorPrefix kitty -e lf
 
-bind = $mainMod, Insert, exec, hyprrun libreoffice
+bind = $mainMod, Insert, exec, libreoffice
 
 bind = $mainMod, V, togglefloating,
 
-bind = $mainMod SHIFT, V, exec, hyprrun vlc
+bind = $mainMod SHIFT, V, exec, vlc
 
-bind = , Menu, exec, rofi -show drun -show-icons -run-command 'hyprrun {cmd}'
+bind = , Menu, exec, rofi -show drun -show-icons -run-command '{cmd}'
 
-bind = $mainMod, Menu, exec, hyprrun hyprpanel -q; hyprrun hyprpanel
+bind = $mainMod, Menu, exec, systemctl restart --user quickshell
 
 #bind = $mainMod, P, pseudo, # dwindle
 #bind = $mainMod, Z, togglesplit, # dwindle
@@ -140,34 +145,34 @@ bind = $mainMod, Menu, exec, hyprrun hyprpanel -q; hyprrun hyprpanel
 bind = $mainMod, N, layoutmsg, rollnext # master
 bind = $mainMod, P, layoutmsg, rollprev # master
 
-bind = $mainMod, M, exec, hyprrun spotify
+bind = $mainMod, M, exec, spotify
 
-bind = $mainMod SHIFT, M, exec, hyprrun firefox soundcloud.com/you/library
+bind = $mainMod SHIFT, M, exec, firefox soundcloud.com/you/library
 
-bind = $mainMod CTRL, M, exec, colorPrefix hyprrun kitty -e ncmpcpp -s browser
+bind = $mainMod CTRL, M, exec, colorPrefix kitty -e ncmpcpp -s browser
 
-bind = $mainMod, XF86AudioPlay, exec, hyprrun mpc load casual
+bind = $mainMod, XF86AudioPlay, exec, mpc load casual
 
-bind = , XF86AudioPlay, exec, hyprrun playerctl play-pause
+bind = , XF86AudioPlay, exec, playerctl play-pause
 
-bind = , XF86AudioPause, exec, hyprrun playerctl pause
+bind = , XF86AudioPause, exec, playerctl pause
 
-bind = , XF86AudioNext, exec, hyprrun playerctl next
+bind = , XF86AudioNext, exec, playerctl next
 
-bind = , XF86AudioPrev, exec, hyprrun playerctl previous
+bind = , XF86AudioPrev, exec, playerctl previous
 
-bind = , XF86Launch2, exec, hyprrun steam
+bind = , XF86Launch2, exec, steam
-bind = $mainMod, XF86Launch2, exec, hyprrun prismlauncher
+bind = $mainMod, XF86Launch2, exec, prismlauncher
 
-bind = , XF86Calculator, exec, hyprrun geogebra
+bind = , XF86Calculator, exec, geogebra
 
-bind = $mainMod SHIFT, Print, exec, hyprrun firefox localhost:631
+bind = $mainMod SHIFT, Print, exec, firefox localhost:631
 
-bind = $mainMod, Return, exec, hyprrun discord --enable-features=UseOzonePlatform --ozone-platform=wayland
+bind = $mainMod, Return, exec, discord --enable-features=UseOzonePlatform --ozone-platform=wayland
 
-bind = $mainMod CTRL, Return, exec, hyprrun firefox https://discord.com/app
+bind = $mainMod CTRL, Return, exec, firefox https://discord.com/app
 
-bind = , Home, exec, hyprrun setWallpaper
+bind = , Home, exec, setWallpaper
 
 # Move focus with mainMod + arrow keys
 bind = $mainMod, W, movefocus, u
@@ -203,26 +208,20 @@ bind = $mainMod SHIFT, 0, movetoworkspace, 10
 bind = $mainMod SHIFT, Home, movetoworkspace, 11
 
 # Scroll through existing workspaces with mainMod + scroll
-bind = $mainMod, right, workspace, e+1
+bind = $mainMod, down, workspace, e+1
-bind = $mainMod, left, workspace, e-1
+bind = $mainMod, up, workspace, e-1
+bind = $mainMod, left, layoutmsg, move -col
+bind = $mainMod, right, layoutmsg, move +col
 
-bind = $mainMod, H, exec, hyprctl keyword animation workspaces,1,6,default
+bind = $mainMod, H, layoutmsg, move -col
-bind = $mainMod, H, workspace, e-1
+bind = $mainMod, J, workspace, r+1
-bind = $mainMod, J, exec, hyprctl keyword animation workspaces,1,6,default,slidevert
+bind = $mainMod, K, workspace, r-1
-bind = $mainMod, J, workspace, e+1
+bind = $mainMod, L, layoutmsg, move +col
-bind = $mainMod, K, exec, hyprctl keyword animation workspaces,1,6,default,slidevert
-bind = $mainMod, K, workspace, e-1
-bind = $mainMod, L, exec, hyprctl keyword animation workspaces,1,6,default
-bind = $mainMod, L, workspace, e+1
 
-bind = $mainMod SHIFT, H, exec, hyprctl keyword animation workspaces,1,6,default
+bind = $mainMod SHIFT, H, layoutmsg, swapcol l
-bind = $mainMod SHIFT, H, movetoworkspace, e-1
+bind = $mainMod SHIFT, J, movetoworkspace, r+1
-bind = $mainMod SHIFT, J, exec, hyprctl keyword animation workspaces,1,6,default,slidevert
+bind = $mainMod SHIFT, K, movetoworkspace, r-1
-bind = $mainMod SHIFT, J, movetoworkspace, e+1
+bind = $mainMod SHIFT, L, layoutmsg, swapcol r
-bind = $mainMod SHIFT, K, exec, hyprctl keyword animation workspaces,1,6,default,slidevert
-bind = $mainMod SHIFT, K, movetoworkspace, e-1
-bind = $mainMod SHIFT, L, exec, hyprctl keyword animation workspaces,1,6,default
-bind = $mainMod SHIFT, L, movetoworkspace, e+1
 
 #switch network connections
 bind = CTRL SHIFT, Escape, exec, nmcli device down wlo1
@@ -239,7 +238,7 @@ bind = , XF86MonBrightnessDown, exec, brightnessctl set 10%-
 binde = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_SINK@ 10%+
 binde = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_SINK@ 10%-
 bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_SINK@ toggle
-bind = $mainMod, F9, exec, hyprrun pavucontrol
+bind = $mainMod, F9, exec, pavucontrol
 
 #screen lock key
 #bind = $mainMod, F12, exec, swaylock
@@ -279,7 +278,7 @@ bind = $mainMod, E, exec, pypr toggle kitty
 bind = $mainMod, C, exec, pypr toggle calendar
 
 
-bind = CTRL SHIFT, Home, exec, hyprrun ssh nathan@esotericbytes.com -fL 5900:localhost:5900 sleep 10; vncviewer localhost:5900 -fullscreen
+bind = CTRL SHIFT, Home, exec, ssh nathan@esotericbytes.com -fL 5900:localhost:5900 sleep 10; vncviewer localhost:5900 -fullscreen
 bind = CTRL SHIFT, Home, submap, clean
 
 

homes/nathan/home-manager/dotfiles/hyprpanel/config.json

@@ -1,65 +0,0 @@
-{
-  "theme.font.name": "FiraCode Nerd Font Mono",
-  "theme.font.label": "FiraCode Nerd Font Mono Medium",
-  "theme.bar.floating": true,
-  "bar.layouts": {
-    "*": {
-      "left": [
-        "dashboard",
-        "workspaces",
-        "windowtitle",
-        "submap",
-        "kbinput"
-      ],
-      "middle": [
-        "volume",
-        "battery",
-        "hyprsunset",
-        "clock",
-        "hypridle",
-        "network",
-        "bluetooth"
-      ],
-      "right": [
-        "ram",
-        "storage",
-        "systray",
-        "cava",
-        "notifications",
-        "power"
-      ]
-    }
-  },
-  "theme.bar.opacity": 50,
-  "wallpaper.image": "/tmp/nathan/bg",
-  "wallpaper.enable": false,
-  "theme.matugen_settings.scheme_type": "content",
-  "theme.matugen_settings.variation": "standard_2",
-  "theme.matugen": true,
-  "bar.launcher.autoDetectIcon": true,
-  "bar.network.truncation_size": 10,
-  "bar.bluetooth.label": false,
-  "bar.clock.showIcon": false,
-  "bar.clock.format": "%A %H:%M:%S %m/%d/%C%y",
-  "bar.notifications.show_total": true,
-  "bar.notifications.hideCountWhenZero": true,
-  "menus.dashboard.shortcuts.left.shortcut2.command": "spotify",
-  "menus.dashboard.shortcuts.left.shortcut1.command": "$BROWSER",
-  "menus.dashboard.shortcuts.left.shortcut1.tooltip": "Browser",
-  "menus.dashboard.shortcuts.left.shortcut1.icon": "󰈹",
-  "menus.dashboard.directories.enabled": false,
-  "menus.dashboard.stats.enable_gpu": true,
-  "menus.power.lowBatteryNotification": true,
-  "bar.customModules.cava.leftClick": "menu:media",
-  "bar.customModules.cava.showIcon": false,
-  "bar.customModules.hypridle.label": false,
-  "bar.customModules.hyprsunset.label": false,
-  "bar.customModules.hyprsunset.temperature": "4000k",
-  "bar.customModules.netstat.dynamicIcon": true,
-  "bar.customModules.netstat.label": true,
-  "bar.workspaces.show_numbered": true,
-  "bar.workspaces.numbered_active_indicator": "highlight",
-  "bar.workspaces.ignored": "-\\d+",
-  "menus.clock.time.military": true,
-  "menus.clock.weather.enabled": false
-}

homes/nathan/home-manager/dotfiles/hyprpanel/modules.json

@@ -1 +0,0 @@
-{}

homes/nathan/home-manager/dotfiles/quickshell/modules/ActiveWindow.qml

@@ -1,37 +0,0 @@
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Widgets
-import Quickshell.Hyprland
-import Quickshell
-
-Item {
-    implicitWidth: t.contentWidth + 10 
-    implicitHeight: 30
-
-    ClippingWrapperRectangle {
-        radius: 5
-        anchors.fill: parent
-        Text {
-            id: t
-            verticalAlignment: Text.AlignVCenter
-            horizontalAlignment: Text.AlignHCenter
-            text: {
-                if(hws.toplevels.values.length > 0) {
-                    return Hyprland.activeToplevel.title
-                } else {
-                    return "  Desktop"
-                }
-            }
-
-            property HyprlandWorkspace hws: Hyprland.focusedWorkspace
-
-            onHwsChanged: {
-                Hyprland.refreshToplevels()
-                Hyprland.refreshWorkspaces()
-            }
-
-            font.pointSize: 11
-        }
-    }
-}

homes/nathan/home-manager/dotfiles/quickshell/modules/Bar.qml

@@ -1,170 +0,0 @@
-import Quickshell // for PanelWindow
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Io
-import Quickshell.Widgets
-import Quickshell.Wayland
-
-PanelWindow {
-    anchors {
-        top: true
-        //left: true
-        //right: true
-        //bottom: true
-
-    }
-
-    id: bar
-
-    exclusionMode: ExclusionMode.Ignore
-    WlrLayershell.layer: WlrLayer.Background
-
-    color: "#a0706050"
-
-
-    implicitHeight: 40
-    implicitWidth: 1900
-
-    /*RowLayout {
-        width: bar.width
-    }*/
-    RowLayout {
-        //Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
-        id: left
-        x: 0
-        y: parent.y + (parent.height - height) / 2
-        //width: center.x
-        spacing: 0
-
-        Launcher { 
-            id: l 
-            Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
-            Layout.preferredWidth: width
-            Layout.margins: 5
-        }
-
-        Workspaces { 
-            id: ws 
-            Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
-            Layout.margins: 5
-        }
-
-        /*ActiveWindow {
-            id: aw
-            Layout.margins: 5
-
-            Layout.maximumWidth: Math.min(implicitWidth, center.x - (parent.x + x + Layout.margins))
-        }*/
-
-    }
-
-    RowLayout {
-        //Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-        id: center
-        x: (parent.width - cl.width) / 2 + parent.x - centerLeft.width
-        //y: parent.y + (parent.height - height) / 2
-        y: parent.y + (parent.height - height) / 2
-        spacing: 0
-
-        RowLayout {
-            id: centerLeft
-            spacing: 0
-            
-            Volume { 
-                id: v 
-                window: bar
-                popupOffset: center.x
-                Layout.margins: 5
-            }
-
-            Battery { 
-                id: bat 
-                window: bar
-                popupOffset: center.x
-                Layout.margins: 5
-            }
-
-            Hyprsunset { 
-                id: hs 
-                Layout.margins: 5
-            }
-        }
-
-
-        Clock { 
-            id: cl 
-            Layout.margins: 5
-        }
-
-        IdleInhibitor { 
-            id: ii 
-            Layout.margins: 5
-        }
-
-        Wifi { 
-            id: wifi 
-            window: bar
-            Layout.margins: 5
-        }
-
-        Bluetooth { 
-            id: bt 
-            window: bar
-            popupOffset: center.x + center.width
-            Layout.margins: 5
-        }
-
-    }
-
-
-    RowLayout {
-        //Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-        id: right
-        //implicitWidth: bar.width - (spacer.x + spacer.width)
-        x: bar.width - implicitWidth
-        y: parent.y + (parent.height - height) / 2
-        //Layout.maximumWidth: bar.width - (center.x + center.width)
-        //Layout.preferredWidth: 10
-        spacing: 0
-
-        Media { 
-            Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-            id: media
-            
-            implicitWidth: Math.min(textWidth, bar.width - (righter.width) - (center.x + center.width) - 10)
-
-            Layout.margins: 5
-        }
-
-        RowLayout {
-            id: righter
-            spacing: 0
-            Tray { 
-                id: tray
-                window: bar 
-                Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-                Layout.margins: 5
-                popupOffset: right.x + righter.x + x
-            }
-
-            Notifications { 
-                id: notif 
-                window: bar
-                Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-                Layout.margins: 5
-            }
-
-            Power { 
-                id: power 
-                window: bar
-                popupOffset: bar.width
-                Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-                Layout.margins: 5
-            }
-        }
-    }
-
-
-
-}

homes/nathan/home-manager/dotfiles/quickshell/modules/Battery.qml

@@ -1,71 +0,0 @@
-import Quickshell // for PanelWindow
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Io
-import Quickshell.Widgets
-import Quickshell.Hyprland
-import Quickshell.Services.UPower
-
-ClippingWrapperRectangle {
-    radius: 5
-    width: 100; height: 30
-    color: "red"
-    Button {
-        id: button
-        text: "󰁹 " + Math.floor(UPower.displayDevice.percentage * 100) + "%"
-        font.pointSize: 12
-        implicitHeight: parent.height
-        //icon.color: "red"
-        //icon.source: "/nix/store/c4dcn4vl0v5njv4d587sazrad1xgyd9h-rose-pine-icon-theme-unstable-2022-09-01/share/icons/rose-pine/symbolic/devices/battery-symbolic.svg"
-        onClicked: {
-            menu.visible = true
-            grab.active = true
-        }
-    }
-
-    required property var window
-    required property real popupOffset
-    id: root
-
-    PopupWindow {
-        
-        id: menu
-
-        anchor.window: window
-        anchor.rect.x: popupOffset
-        anchor.rect.y: 50
-        implicitWidth: 250
-        implicitHeight: 150
-        visible: false
-
-        color: "transparent"
-        
-        ClippingWrapperRectangle {
-            radius: 5
-
-            implicitHeight: parent.height - 20
-            implicitWidth: parent.width
-            
-            ColumnLayout {
-
-                spacing: 0
-
-                Button {
-                    Layout.topMargin: 5
-                    x: (parent.width - width) / 2
-                    implicitWidth: parent.width - 10
-                    implicitHeight: parent.height / 5 - parent.spacing
-
-                    text: 'shutdown'
-                }
-            }
-        }
-
-        HyprlandFocusGrab {
-            id: grab
-            windows: [ menu ]
-            onCleared: menu.visible = false
-        }
-    }
-}

homes/nathan/home-manager/dotfiles/quickshell/modules/Bluetooth.qml

@@ -1,141 +0,0 @@
-import Quickshell // for PanelWindow
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Io
-import Quickshell.Widgets
-import Quickshell.Hyprland
-import Quickshell.Bluetooth
-
-ClippingWrapperRectangle {
-    
-    
-    radius: 5
-    implicitWidth: 30; implicitHeight: 30
-    Button {
-        id: button
-        text: ""
-        font.pointSize: 16
-        
-        onClicked: {
-            menu.visible = true
-            grab.active = true
-        }
-        implicitHeight: parent.height
-    }
-
-    required property PanelWindow window
-    required property real popupOffset
-    id: root
-
-    PopupWindow {
-        
-        id: menu
-
-        anchor.window: window
-        anchor.rect.x: popupOffset - width
-        anchor.rect.y: 50
-        implicitWidth: 250
-        implicitHeight: 150
-        visible: false
-
-        color: "transparent"
-        
-        ClippingWrapperRectangle {
-            radius: 5
-
-            implicitHeight: parent.height - 20
-            implicitWidth: parent.width
-            
-            ColumnLayout {
-
-                spacing: 0
-
-                ClippingWrapperRectangle {
-                    radius: 5
-                    implicitWidth: parent.width - 2 * Layout.margins
-                    implicitHeight: 30
-                    Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
-                    Layout.margins: 5
-                    color: "#ff3333aa"
-
-                    RowLayout {
-                        Text {
-                            text: 'Bluetooth'
-                            Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
-                            Layout.margins: 5
-                        }
-
-                        Switch {
-                            Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-                            //Layout.margins: 5
-                            checked: Bluetooth.defaultAdapter.enabled
-                            onClicked: Bluetooth.defaultAdapter.enabled = checked
-                        }
-                    }
-
-                }
-
-                ScrollView {
-                    Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
-                    Layout.margins: 5
-
-                    implicitWidth: parent.width - 4 * Layout.margins
-                    implicitHeight: menu.height / 2
-
-                    id: scroll
-
-                    ColumnLayout {
-                        spacing: 0
-
-                        Repeater {
-
-                            id: rep
-
-                            model: Bluetooth.devices.values
-
-                            ClippingWrapperRectangle {
-                                radius: 5
-                                color: "#ff3333aa"
-
-                                implicitWidth: menu.width - 3 * scroll.x
-                                implicitHeight: 40
-                                
-                                Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
-                                Layout.margins: 5
-
-                                RowLayout {
-                                    Text {
-                                        Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
-                                        Layout.margins: 5
-                                        
-                                        text: rep.model[index].name
-                                    }
-
-                                    Button {
-                                        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-                                        Layout.rightMargin: 5
-                                        text: 'Connect'
-
-                                        onClicked: rep.model[index].connected = !rep.model[index].connected
-                                    }
-                                }
-
-
-                            }
-
-                        }
-                    }
-
-                }
-
-            }
-        }
-
-        HyprlandFocusGrab {
-            id: grab
-            windows: [ menu ]
-            onCleared: menu.visible = false
-        }
-    }
-}

homes/nathan/home-manager/dotfiles/quickshell/modules/Clock.qml

@@ -1,27 +0,0 @@
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Widgets
-import Quickshell
-
-Item {
-    implicitWidth: t.contentWidth + 10 
-    implicitHeight: 30
-
-    ClippingWrapperRectangle {
-        radius: 5
-        anchors.fill: parent
-        Text {
-            id: t
-            verticalAlignment: Text.AlignVCenter
-            horizontalAlignment: Text.AlignHCenter
-            text: Qt.formatDateTime(clock.date, "dddd HH:mm:ss MM/dd/yyyy")
-            font.pointSize: 11
-
-            SystemClock {
-                id: clock
-                precision: SystemClock.Seconds
-            }
-        }
-    }
-}

homes/nathan/home-manager/dotfiles/quickshell/modules/Hyprsunset.qml

@@ -1,30 +0,0 @@
-import Quickshell // for PanelWindow
-import QtQuick // for Text
-import QtQuick.Controls
-import Quickshell.Io
-import Quickshell.Widgets
-
-ClippingWrapperRectangle {
-    radius: 5
-    implicitWidth: 30; height: 30
-    Button {
-        id: button
-        text: "󰛨 "
-        font.pointSize: 16
-        Process {
-            id: idlent
-            running: false
-            command: ["hyprsunset", "-t", "4000"]
-
-            onExited: {
-                running = button.text == "󰛨 " ? false : true
-            }
-        }
-
-        onClicked: {
-            idlent.running = button.text == "󰛨 " ? true : false
-            button.text = button.text == "󰛨 " ? "󱩌 " : "󰛨 "
-        }
-        implicitHeight: parent.height
-    }
-}

homes/nathan/home-manager/dotfiles/quickshell/modules/IdleInhibitor.qml

@@ -1,34 +0,0 @@
-import Quickshell // for PanelWindow
-import QtQuick // for Text
-import QtQuick.Controls
-import Quickshell.Io
-import Quickshell.Widgets
-
-ClippingWrapperRectangle {
-
-    property real interval: 100
-    id: root
-
-    radius: 5
-    implicitWidth: 30; height: 30
-    Button {
-        id: button
-        text: "󰒲 "
-        font.pointSize: 16
-        Process {
-            id: idlent
-            running: false
-            command: ["systemd-inhibit", "--what=idle", "sleep", root.interval.toString()]
-
-            onExited: {
-                running = button.text == "󰒲 " ? false : true
-            }
-        }
-
-        onClicked: {
-            idlent.running = button.text == "󰒲 " ? true : false
-            button.text = button.text == "󰒲 " ? "󰒳 " : "󰒲 "
-        }
-        implicitHeight: parent.height
-    }
-}

homes/nathan/home-manager/dotfiles/quickshell/modules/Launcher.qml

@@ -1,22 +0,0 @@
-import Quickshell // for PanelWindow
-import QtQuick // for Text
-import QtQuick.Controls
-import Quickshell.Io
-import Quickshell.Widgets
-
-ClippingWrapperRectangle {
-    radius: 5
-    width: 30; height: 30
-    Button {
-        id: button
-        text: " "
-        font.pointSize: 16
-        Process {
-            id: launcher
-            running: false
-            command: ["rofi", "-show", "drun"]
-        }
-        onClicked: launcher.running = true
-        implicitHeight: parent.height
-    }
-}

homes/nathan/home-manager/dotfiles/quickshell/modules/Media.qml

@@ -1,48 +0,0 @@
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Services.Mpris
-import Quickshell.Widgets
-
-Item {
-    id: media
-    height: 30
-
-    readonly property real textWidth: info.contentWidth + 10
-
-    ClippingWrapperRectangle {
-        radius: 5
-        anchors.fill: parent
-        Text {
-
-            verticalAlignment: Text.AlignVCenter
-            horizontalAlignment: Text.AlignHCenter
-
-            id: info
-
-            text: {
-                let s = ''
-                let players = []
-                
-                Mpris.players.values.forEach((p) => { 
-                    if(p.isPlaying) players.push(p)
-                })
-                
-                if(players[0]?.trackTitle) {
-                    s += players[0].trackTitle
-                }
-                if(players[0]?.trackAlbum) {
-                    s += ' - ' + players[0].trackAlbum
-                }
-                if(players[0]?.trackArtist) {
-                    s += ' - ' + players[0].trackArtist
-                }
-
-                media.visible = players.length > 0
-
-                return s
-            }
-            font.pointSize: 11
-        }
-    }
-}

homes/nathan/home-manager/dotfiles/quickshell/modules/Notifications.qml

@@ -1,183 +0,0 @@
-import Quickshell
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Services.Notifications
-import Quickshell.Io
-import Quickshell.Widgets
-import Quickshell.Hyprland
-
-Item {
-    width: 50
-    height: 30
-
-    ClippingWrapperRectangle {
-        id: barbutton
-        radius: 5
-        anchors.fill: parent
-        Button {
-            id: button
-            text: "󰂚"
-            //text: server.trackedNotifications.values.length == 0 ? "󰂚" : '󱅫 ' + server.trackedNotifications.values.length
-            //icon.source: ''
-            font.pointSize: 16
-            
-            onClicked: {
-                
-
-                menu.visible = true
-                grab.active = true
-            }
-            implicitHeight: parent.height
-        }
-    }
-
-    NotificationServer {
-        id: server
-        persistenceSupported: true
-        imageSupported: true
-        actionsSupported: true
-        bodyImagesSupported: true
-        bodySupported: true
-        bodyHyperlinksSupported: true
-        inlineReplySupported: true
-        actionIconsSupported: true
-
-        onNotification: (n) => {
-            n.tracked = true
-            console.log(n?.body)
-            button.text = '󱅫 ' + (server.trackedNotifications.values.length + 1)
-        }
-
-    }
-
-    required property PanelWindow window
-    id: root
-
-    PopupWindow {
-        
-        id: menu
-
-        anchor.window: window
-        anchor.rect.x: window.width - width
-        anchor.rect.y: 50
-        implicitWidth: 400
-        implicitHeight: 1080 - anchor.rect.y
-        visible: false
-
-        color: "transparent"
-        
-        ClippingWrapperRectangle {
-            radius: 5
-            
-            color: "#ff706050"
-
-            implicitHeight: parent.height - 20
-            implicitWidth: parent.width
-            
-            ColumnLayout {
-                id: lay
-
-                spacing: 10
-
-                ClippingWrapperRectangle {
-                    radius: 5
-                    Layout.margins: 5
-                    Layout.alignment: Qt.AlignVCenter | Qt.AlignTop
-                    implicitWidth: menu.width - 2 * Layout.margins
-                    
-                    RowLayout {
-                        width: parent.width
-                        Text {
-                            Layout.margins: 5
-                            Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
-                            text: 'Notifications'
-                        }
-                        Button {
-                            Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-                            Layout.margins: 5
-                            implicitWidth: 20
-                            implicitHeight: 20
-
-                            text: 'x'
-
-                            onClicked: {
-                                while(server.trackedNotifications.values.length > 0) {
-                                     server.trackedNotifications.values[0].dismiss()
-                                }
-                            }
-                        }
-                    }
-                }
-
-                
-                Repeater {
-                    id: rep
-
-                    model: server.trackedNotifications.values
-                    ClippingWrapperRectangle {
-                        Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
-                        Layout.margins: 5
-                        radius: 10
-                        implicitWidth: parent.width - 2 * Layout.margins
-                        implicitHeight: 100
-                        MouseArea {
-                            anchors.fill: parent
-                            
-                            RowLayout {
-                                Image {
-                                    //anchors.fill: parent
-                                    source: {
-                                        let icon = rep.model[index].image
-                                        if (icon.includes("?path=")) {
-                                            const [name, path] = icon.split("?path=");
-                                            icon = Qt.resolvedUrl(`${path}/${name.slice(name.lastIndexOf("/") + 1)}`);
-                                        }
-                                        return icon
-                                    }
-
-                                    Layout.maximumWidth: 100
-                                    Layout.maximumHeight: 100
-                                }
-                                
-                                ColumnLayout {
-                                    Layout.topMargin: 10
-                                    Layout.alignment: Qt.AlignLeft | Qt.AlignTop
-                                    Text {
-                                        Layout.alignment: Qt.AlignLeft | Qt.AlignTop
-                                        text: rep.model[index].summary
-                                        Layout.leftMargin: 10
-                                        font.pointSize: 14
-                                    }
-                                    Text {
-                                        Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
-                                        text: rep.model[index].body
-                                        Layout.leftMargin: 10
-                                        font.pointSize: 12
-                                    }
-                                }
-                            }
-
-                            acceptedButtons: Qt.LeftButton | Qt.RightButton
-
-                            onClicked: mouse => {
-                                if(mouse.button == Qt.LeftButton) {
-                                    button.text = rep.count - 1 <= 0 ? "󰂚" : '󱅫 ' + (rep.count - 1)
-                                    rep.model[index].dismiss()
-                                    //button.text = server.trackedNotifications.values.length == 0 ? "󰂚" : '󱅫 ' + server.trackedNotifications.values.length
-                                } else if(mouse.button == Qt.RightButton) {
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        HyprlandFocusGrab {
-            id: grab
-            windows: [ menu ]
-            onCleared: menu.visible = false
-        }
-    }
-}

homes/nathan/home-manager/dotfiles/quickshell/modules/Power.qml

@@ -1,96 +0,0 @@
-import Quickshell
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Hyprland
-import Quickshell.Io
-import Quickshell.Widgets
-
-Item {
-    width: 30
-    height: 30
-
-    id: root
-
-    required property PanelWindow window
-    required property real popupOffset
-
-    ClippingWrapperRectangle {
-        radius: 5
-        width: 30; height: 30
-        Button {
-            id: button
-            text: " "
-            font.pointSize: 16
-            
-            onClicked: {
-                menu.visible = true
-                grab.active = true
-            }
-            implicitHeight: parent.height
-        }
-    }
-
-    PopupWindow {
-        
-        id: menu
-
-        anchor.window: window
-        anchor.rect.x: popupOffset
-        anchor.rect.y: 50
-        implicitWidth: 150
-        implicitHeight: 250
-        visible: false
-
-        color: "transparent"
-        
-        ClippingWrapperRectangle {
-            radius: 5
-
-            implicitHeight: parent.height - 20
-            implicitWidth: parent.width
-            
-            ColumnLayout {
-
-                spacing: 0
-
-                Button {
-                    Layout.topMargin: 5
-                    x: (parent.width - width) / 2
-                    implicitWidth: parent.width - 10
-                    implicitHeight: parent.height / 5 - parent.spacing
-
-                    text: 'shutdown'
-                }
-                
-                Button {
-                    x: (parent.width - width) / 2
-                    implicitWidth: parent.width - 10
-                    implicitHeight: parent.height / 5 - parent.spacing
-                    text: 'reboot'
-                }
-                
-                Button {
-                    x: (parent.width - width) / 2
-                    implicitWidth: parent.width - 10
-                    implicitHeight: parent.height / 5 - parent.spacing
-                    text: 'logout'
-                }
-                
-                Button {
-                    Layout.bottomMargin: 10
-                    x: (parent.width - width) / 2
-                    implicitWidth: parent.width - 10
-                    implicitHeight: parent.height / 5 - parent.spacing
-                    text: 'sleep'
-                }
-            }
-        }
-
-        HyprlandFocusGrab {
-            id: grab
-            windows: [ menu ]
-            onCleared: menu.visible = false
-        }
-    }
-}

homes/nathan/home-manager/dotfiles/quickshell/modules/Tray.qml

@@ -1,62 +0,0 @@
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Services.SystemTray
-import Quickshell.Widgets
-
-Item {
-    implicitWidth: 10 + rep.count * (2 * lay.spacing + 20)
-    height: 30
-    visible: SystemTray.items.values.length != 0
-
-    id: root
-    required property var window
-    required property real popupOffset
-
-    ClippingWrapperRectangle {
-        radius: 5
-        anchors.fill: parent
-        RowLayout {
-            id: lay
-            spacing: 4
-            Repeater {
-                id: rep
-
-                model: SystemTray.items
-                ClippingWrapperRectangle {
-                    Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-                    radius: 10
-                    implicitWidth: 20
-                    implicitHeight: 20
-                    MouseArea {
-                        anchors.fill: parent
-                        
-                        Image {
-                            anchors.fill: parent
-                            source: {
-                                let icon = SystemTray.items.values[index].icon
-                                if (icon.includes("?path=")) {
-                                    const [name, path] = icon.split("?path=");
-                                    icon = Qt.resolvedUrl(`${path}/${name.slice(name.lastIndexOf("/") + 1)}`);
-                                }
-                                return icon
-                            }
-                        }
-
-                        acceptedButtons: Qt.LeftButton | Qt.RightButton
-
-                        onClicked: (mouse) => {
-                            if(mouse.button == Qt.LeftButton) {
-                                SystemTray.items.values[index].activate()
-                            } else if(mouse.button == Qt.RightButton) {
-                                SystemTray.items.values[index].display(root.window, popupOffset, 40)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-
-    }
-}

homes/nathan/home-manager/dotfiles/quickshell/modules/Volume.qml

@@ -1,97 +0,0 @@
-import Quickshell // for PanelWindow
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Io
-import Quickshell.Widgets
-import Quickshell.Hyprland
-import Quickshell.Services.Pipewire
-
-ClippingWrapperRectangle {
-    radius: 5
-    width: 100; height: 30
-    Button {
-        id: button
-        text: "   " + Math.floor(Pipewire.defaultAudioSink?.audio?.volume * 100) + "%"
-        font.pointSize: 12
-        implicitHeight: parent.height
-
-        PwObjectTracker {
-            objects: [ Pipewire.defaultAudioSink ]
-        }
-
-        onClicked: {
-            menu.visible = true
-            grab.active = true
-        }
-
-    }
-
-    required property var window
-    required property real popupOffset
-    id: root
-
-    PopupWindow {
-        
-        id: menu
-
-        anchor.window: window
-        anchor.rect.x: popupOffset
-        anchor.rect.y: 50
-        implicitWidth: 250
-        implicitHeight: 150
-        visible: false
-
-        color: "transparent"
-        
-        ClippingWrapperRectangle {
-            radius: 5
-
-            implicitHeight: parent.height - 20
-            implicitWidth: parent.width
-
-            ScrollView {
-                ColumnLayout {
-
-                    spacing: 0
-
-                    Text {
-                        text: 'Output Devices'
-                    }
-
-                    ColumnLayout {
-                        
-                    }
-
-                    Text {
-                        text: 'Input Devices'
-                    }
-
-                    ColumnLayout {
-                        /*Repeater {
-                            id: in
-
-                            model: {
-                                set = []
-                                Pipewire.nodes.values.forEach(n => { !n.isSink && !n.isStream ? set.push(n) : return })
-                                return set
-                            }
-
-                            Text {
-                                text: in.model[index].nickname
-                            }
-                        }*/
-                    }
-
-                }
-            }
-            
-        }
-
-        HyprlandFocusGrab {
-            id: grab
-            windows: [ menu ]
-            onCleared: menu.visible = false
-        }
-    }
-}

homes/nathan/home-manager/dotfiles/quickshell/modules/Wifi.qml

@@ -1,72 +0,0 @@
-import Quickshell
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Hyprland
-import Quickshell.Io
-import Quickshell.Widgets
-
-Item {
-    implicitWidth: 30
-    implicitHeight: 30
-
-    ClippingWrapperRectangle {
-        radius: 5
-        anchors.fill: parent
-        Button {
-            id: button
-            text: "󰤨 "
-            font.pointSize: 16
-            
-            onClicked: {
-                menu.visible = true
-                grab.active = true
-            }
-            implicitHeight: parent.height
-        }
-    }
-
-    property var window: null
-    id: root
-
-    PopupWindow {
-        
-        id: menu
-
-        anchor.window: window
-        anchor.rect.x: root.parent.x + root.parent.width - width
-        anchor.rect.y: 50
-        implicitWidth: 250
-        implicitHeight: 150
-        visible: false
-
-        color: "transparent"
-        
-        ClippingWrapperRectangle {
-            radius: 5
-
-            implicitHeight: parent.height - 20
-            implicitWidth: parent.width
-            
-            ColumnLayout {
-
-                spacing: 0
-
-                Button {
-                    Layout.topMargin: 5
-                    x: (parent.width - width) / 2
-                    implicitWidth: parent.width - 10
-                    implicitHeight: parent.height / 5 - parent.spacing
-
-                    text: 'shutdown'
-                }
-            }
-        }
-
-        HyprlandFocusGrab {
-            id: grab
-            windows: [ menu ]
-            onCleared: menu.visible = false
-        }
-    }
-}

homes/nathan/home-manager/dotfiles/quickshell/modules/Workspaces.qml

@@ -1,46 +0,0 @@
-import QtQuick // for Text
-import QtQuick.Controls
-import QtQuick.Layouts
-import Quickshell.Hyprland
-import Quickshell.Widgets
-
-Item {
-    implicitWidth: 10 + rep.count * (2 * lay.spacing + 25)
-    implicitHeight: 30
-
-    Component.onCompleted: Hyprland.refreshWorkspaces()
-
-    ClippingWrapperRectangle {
-        radius: 5
-        anchors.fill: parent
-        RowLayout {
-            id: lay
-            Repeater {
-                id: rep
-
-                property var ws: {
-                    let arr = [];
-                    Hyprland.workspaces.values.forEach((w) => { if(w.id > 0) arr.push(w) })
-                    return arr;
-                }
-
-                model: ws
-                ClippingWrapperRectangle {
-                    Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-                    radius: 10
-                    implicitWidth: 25
-                    Button {
-                        background: Rectangle {
-                            color: Hyprland.focusedWorkspace.id == rep.model[index].id ? "#ffff00ff" : "#ff7744dd"
-                            anchors.fill: parent
-                        }
-                        text: rep.model[index].id
-                        onClicked: rep.model[index].activate()
-                    }
-                }
-            }
-        }
-
-
-    }
-}

homes/nathan/home-manager/dotfiles/quickshell/shell.qml

@@ -1,14 +0,0 @@
-//@ pragma Env QS_NO_RELOAD_POPUP=1
-//@ pragma Env QSG_RENDER_LOOP=threaded
-//@ pragma Env QT_QUICK_FLICKABLE_WHEEL_DECELERATION=10000
-
-//@ pragma UseQApplication
-
-import Quickshell // for ShellRoot
-import qs.modules
-
-ShellRoot {
-    Bar { 
-        id: bar 
-    }
-}

homes/nathan/home-manager/packages/default.nix

@@ -1,5 +1,7 @@
-{ config, lib, pkgs, inputs, ... }: let 
+{ inputs, ... }: {
-    system = "x86_64-linux";
+
+    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;
@@ -26,7 +24,7 @@
                 openssh
                 sops
                 dig
-                toybox
+                #toybox
                 btop
                 zip    
                 unzip
@@ -85,7 +83,6 @@
          quickemu
          bottles
 
-            pkgs-us.runapp
          brightnessctl
          libdbusmenu-gtk3
          lmms
@@ -102,6 +99,7 @@
          rpi-imager
          tigervnc
          keepassxc
+         localsend
 
 #3D modeling/printing
          blender
@@ -116,4 +114,5 @@
          ];
         })
         ];
+    };
 }

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";
 
@@ -21,7 +23,7 @@
              home.packages = [
              (pkgs.writeShellScriptBin "hyprrun" ''
               ${pkgs-us.runapp}/bin/runapp ''$@
-                #uwsm app -- ''$@
+#uwsm app -- ''$@
               '')
              ];
              })
@@ -37,7 +39,7 @@
         (lib.mkIf config.homeconfig.scripts.enable {
          home.packages = [
 
-            #scripts
+#scripts
 
          (pkgs.writeShellScriptBin "randWallpaper" ''
           file=''$(ls ${config.home.homeDirectory}/Pictures/Wallpaper/ | shuf -n 1)
@@ -60,15 +62,12 @@
           cp /tmp/nathan/tmp.jpg /tmp/nathan/tmp2.jpg
           pidof mpvpaper && pkill mpvpaper
           ${pkgs.swww}/bin/swww img /tmp/nathan/tmp.jpg -t wipe >> ''$out
-                    ${pkgs.hyprpanel}/bin/hyprpanel sw /tmp/nathan/tmp2.jpg >> ''$out
           sleep 0.3
           hyprctl dispatch exec "${pkgs.mpvpaper}/bin/mpvpaper ALL ''$img -o loop"
-                    ${pkgs.hyprpanel}/bin/hyprpanel sw /tmp/nathan/tmp.jpg >> ''$out
           rm /tmp/nathan/tmp2.jpg
           else
               pidof mpvpaper && pkill mpvpaper
                   hyprctl dispatch exec "${pkgs.swww}/bin/swww img ''$img -t wipe" >> ''$out
-                    ${pkgs.hyprpanel}/bin/hyprpanel sw "''$img" >> ''$out
                   fi
 
                   changeColors "''$img" "''$2" >> ''$out
@@ -125,11 +124,12 @@
                    sleep 3
                    hyprctl reload
                    hyprctl dispatch exec ${pkgs.pyprland}/bin/pypr toggle calendar
-                #tmux new-session -s hyprland 
+#tmux new-session -s hyprland 
                    '')
 
                    ];
         })
         ];
+    };
 }
 

homes/nathan/home-manager/programs/aurora/default.nix

@@ -0,0 +1,25 @@
+{ 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;
+
+                systemd = {
+                    enable = true;
+                };
+            };
+        };
+    };
+}

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
             ];
         };
+    };
 }

homes/nathan/home-manager/programs/default.nix

@@ -1,12 +1,6 @@
-{ 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, ... }: {
 
         config = {
 
@@ -16,4 +10,5 @@
 
             home.sessionVariables.EDITOR = "nvim";
         };
+    };
 }

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 @@
                 };
             };
         };
+    };
 }

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 @@
                 };
             };
         };
+    };
 }

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;
@@ -31,16 +33,17 @@
 
                 enable = true;
 
+                package = null;
+                portalPackage = null;
+
                 systemd = {
-                enable = false;
+                    enable = true;
                     variables = [ "--all" ];
                 };
 
-            extraConfig = (if config.homeconfig.hyprpanel.enable then ''
+                extraConfig = ''
-                    bind = , Print, exec, bash -c ${pkgs.hyprpanel}/share/scripts/screenshot.sh"
+                    bind = , Print, exec, grim -g "$(slurp)" > ~/Pictures/screenshots/$(date +"%m-%d-%Y_%H:%M:%S").png
-                '' else ''
+
-                    bind = , Print, exec, grim -g "$(slurp)"
-                '') + ''
                     source = ${config.home.homeDirectory}/.config/hypr/main.conf
 
                     exec-shutdown = if [[ -f ${config.home.homeDirectory}/.local/share/calcurse/.calcurse.pid ]]; then rm ${config.home.homeDirectory}/.local/share/calcurse/.calcurse.pid; fi
@@ -48,4 +51,5 @@
 
             };
         };
+    };
 }

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 @@
                 };
             };
         };
+    };
 }

homes/nathan/home-manager/programs/hyprpanel/default.nix

@@ -1,14 +0,0 @@
-{ config, lib, ... }: {
-
-    options.homeconfig.hyprpanel.enable = with lib; mkOption {
-        type = with types; bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.hyprpanel.enable {
-        
-        programs.hyprpanel = {
-            enable = true;
-        };
-    };
-}

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;
@@ -10,7 +12,7 @@
             programs.nh = {
                 enable = true;
                 package = let pkgs-us = import inputs.nixpkgs-us { system = "x86_64-linux"; }; in pkgs-us.nh;
-            #flake = "${config.home.homeDirectory}/Projects/Olympus";
+#flake = "${config.home.homeDirectory}/Projects/Olympus";
 
                 clean = {
                     enable = true;
@@ -19,4 +21,5 @@
                 };
             };
         };
+    };
 }

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 @@
             ];
 
 
+        };
     };
 }

homes/nathan/home-manager/programs/quickshell/default.nix

@@ -1,26 +0,0 @@
-{ config, lib, ... }: {
-
-    options.homeconfig.quickshell.enable = with lib; mkOption {
-        type = with types; bool;
-        default = false;
-    };
-
-    config = lib.mkIf config.homeconfig.quickshell.enable {
-        
-        programs.quickshell = {
-            enable = true;
-
-            configs = {
-
-                default = config.homeDirectory + "/${config.home.file.".config/quickshell".target}";
-            };
-
-            systemd = {
-                enable = true;
-                target = lib.mkIf config.homeconfig.hyprland.enable "wayland-session@Hyprland.target";
-            };
-
-            activeConfig = "default";
-        };
-    };
-}

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";
             };
         };
+    };
 }
 

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)"
             '');
         };
+    };
 }

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 @@
             ];
 
 
+        };
     };
 }

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
-  ];
-}

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";
         };
+    };
 }

homes/nathan/home-manager/programs/terminal/fzf/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, lib, pkgs, ... }: {
 
         programs.fzf = {
 
@@ -7,9 +9,10 @@
             enableZshIntegration = true;
 
             tmux = {
-      #enableShellIntegration = true;
+#enableShellIntegration = true;
 
-      #shellIntegrationOptions = [];
+#shellIntegrationOptions = [];
+            };
         };
     };
 }

homes/nathan/home-manager/programs/terminal/kitty/default.nix

@@ -1,4 +1,6 @@
-{ config, ... }: {
+{ ... }: {
+
+    flake.homeModules.nathan = { config, ... }: {
 
         programs.kitty = {
 
@@ -11,23 +13,24 @@
 
             extraConfig = ''
 
-confirm_os_window_close 0
+                confirm_os_window_close 0
 
-include ${config.home.homeDirectory}/.cache/wal/colors-kitty.conf
+                include ${config.home.homeDirectory}/.cache/wal/colors-kitty.conf
 
-disable_ligatures never
+                disable_ligatures never
 
-dynamic_background_opacity yes
+                dynamic_background_opacity yes
 
-tab_bar_edge top
+                tab_bar_edge top
 
-map ctrl+shift+t new_tab
+                map ctrl+shift+t new_tab
-map ctrl+shift+w close_tab
+                map ctrl+shift+w close_tab
 
-map ctrl+tab next_tab
+                map ctrl+tab next_tab
-map ctrl+shift+tab previous_tab
+                map ctrl+shift+tab previous_tab
 
                 '';
         };
+    };
 }
 

homes/nathan/home-manager/programs/terminal/lf/default.nix

@@ -1,7 +1,10 @@
 { ... }: {
+
+    flake.homeModules.nathan = { ... }: {
         config = {
             programs.lf = {
                 enable = true;
             };
         };
+    };
 }

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
@@ -22,11 +24,11 @@
         home.file.".config/wal/templates/ohmyposh.toml".text = ''
 #:schema https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json
 
-version = 2
+            version = 2
-final_space = true
+            final_space = true
-console_title_template = '{{{{ .Shell }}}} in {{{{ .Folder }}}}'
+            console_title_template = '{{{{ .Shell }}}} in {{{{ .Folder }}}}'
 
-[[blocks]]
+            [[blocks]]
             type = 'prompt'
             alignment = 'left'
             newline = true
@@ -58,7 +60,7 @@ console_title_template = '{{{{ .Shell }}}} in {{{{ .Folder }}}}'
             [blocks.segments.properties]
             style = 'full'
 
-[[blocks]]
+            [[blocks]]
             type = 'prompt'
             overflow = 'hidden'
             alignment = 'right'
@@ -85,7 +87,7 @@ console_title_template = '{{{{ .Shell }}}} in {{{{ .Folder }}}}'
             background = 'p:c1'
             foreground = 'p:c12'
 
-[[blocks]]
+            [[blocks]]
             type = 'prompt'
             alignment = 'left'
             newline = true
@@ -100,7 +102,7 @@ console_title_template = '{{{{ .Shell }}}} in {{{{ .Folder }}}}'
             ]
             template = "{{{{ if gt .Code 0 }}}}!❭ {{{{else}}}}❭ {{{{end}}}}"
 
-[transient_prompt] 
+            [transient_prompt] 
             foreground_templates = [
                 "{{{{ if gt .Code 0 }}}}p:c13{{{{end}}}}",
                 "{{{{ if eq .Code 0 }}}}p:c14{{{{end}}}}",
@@ -108,29 +110,30 @@ console_title_template = '{{{{ .Shell }}}} in {{{{ .Folder }}}}'
             background = 'transparent'
             template = "{{{{ if gt .Code 0 }}}}!❭ {{{{else}}}}❭ {{{{end}}}}"
 
-[secondary_prompt]
+            [secondary_prompt]
             background = 'transparent'
             forground = 'p:c14'
             template = "❭❭ "
 
 
-[palette]
+            [palette]
 
-c0 = "{color0}"
+            c0 = "{color0}"
-c1 = "{color1}"
+            c1 = "{color1}"
-c2 = "{color2}"
+            c2 = "{color2}"
-c3 = "{color3}"
+            c3 = "{color3}"
-c4 = "{color4}"
+            c4 = "{color4}"
-c5 = "{color5}"
+            c5 = "{color5}"
-c6 = "{color6}"
+            c6 = "{color6}"
-c7 = "{color7}"
+            c7 = "{color7}"
-c8 = "{color8}"
+            c8 = "{color8}"
-c9 = "{color9}"
+            c9 = "{color9}"
-c10 = "{color10}"
+            c10 = "{color10}"
-c11 = "{color11}"
+            c11 = "{color11}"
-c12 = "{color12}"
+            c12 = "{color12}"
-c13 = "{color13}"
+            c13 = "{color13}"
-c14 = "{color14}"
+            c14 = "{color14}"
-c15 = "{color15}"
+            c15 = "{color15}"
         '';
+    };
 }

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 @@
                 };
             };
         };
+    };
 }

homes/nathan/home-manager/programs/terminal/ripgrep/default.nix

@@ -0,0 +1,9 @@
+{ ... }: {
+
+    flake.homeModules.nathan = { ... }: {
+
+        programs.ripgrep = {
+            enable = true;
+        };
+    };
+}

homes/nathan/home-manager/programs/terminal/ssh/default.nix

@@ -1,10 +1,12 @@
 { ... }: {
 
+    flake.homeModules.nathan = { ... }: {
+
         programs.ssh = {
 
             enable = true;
 
-    # defaults as of 25.11
+# defaults as of 25.11
             matchBlocks."*" = {
                 forwardAgent = false;
                 addKeysToAgent = "no";
@@ -20,5 +22,6 @@
             enableDefaultConfig = false;
 
 
+        };
     };
 }

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 @@
 
         };
 
+    };
 }
 
 

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"
             ];
         };
+    };
 }

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;
             };
         };
+    };
 }

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)
-    );
-}

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 @@
             };
         };
 
+    };
 }

homes/nathan/home.nix

@@ -1,13 +1,15 @@
-{ lib, inputs, ... }:
+{ self, inputs, ... }: {
 
-{
+    flake.homeModules.nathan = { lib, ... }:
+
+    {
 
         config = {                    
             homeconfig = {
                 graphical = lib.mkDefault false;
                 minimal = lib.mkDefault false;
 
-            hyprland.enable = false;
+                hyprland.enable = lib.mkDefault false;
             };
 
 
@@ -16,10 +18,21 @@
                 settings = {
                     experimental-features = [ "nix-command" "flakes" ];
                     builders = "ssh://builder x86_64-linux,aarch64-linux /run/secrets/remoteBuildKey 1 1 nixos-test,benchmark,big-parallel,kvm - -";
-                builders-use-substituters = true;
+                    builders-use-substitutes = true;
                 };
             };
 
             programs.home-manager.enable = true;
         };
- }
+    };
+
+    flake.homeConfigurations.nathan = inputs.home-manager.lib.homeManagerConfiguration {
+        pkgs = import inputs.nixpkgs {
+            system = builtins.currentSystem;
+        };
+
+        modules = [
+            self.homeModules.nathan
+        ];
+    };
+}

profiles/container/default.nix

@@ -1,6 +1,8 @@
-{ config, pkgs, lib, inputs, ... }:
+{ inputs, ... }: {
 
-{
+    flake.nixosModules.container = { config, pkgs, lib, ... }:
+
+    {
         imports =
             [
 
@@ -124,7 +126,6 @@
                                 minimal = false;
                                 hyprland.enable = false;
                                 wal.enable = false;
-                            hyprpanel.enable = false;
                                 hyprlock.enable = false;
                                 mpd.enable = true;
                                 calcurse.enable = true;
@@ -154,4 +155,5 @@
             fonts.packages = with pkgs; [ nerd-fonts.fira-code ];
 
         };
+    };
 }

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
 
             ];
 
@@ -43,7 +45,7 @@
                     enable = true;
                     internalInterfaces = [ "ve-.+" ];
                     externalInterface = "wlp7s0"; # wifi
-                #externalInterface = "enp6s0"; # ethernet
+#externalInterface = "enp6s0"; # ethernet
                 };
             };
 
@@ -58,6 +60,7 @@
                     netbird.enable = true;
 
                     ollama.enable = false;
+                    avahi.enable = true;
                     wyoming = {
                         enable = true;
                         piper = true;
@@ -68,7 +71,6 @@
 
                 programs = {
                     hyprland.enable = false;
-                hyprpanel.enable = false;
                     steam.enable = false;
                 };
 
@@ -87,7 +89,7 @@
                     home-assistant.enable = true;
                     n8n.enable = true;
 
-                nextcloud.enable = true;
+                    nextcloud.enable = false;
                     jellyfin.enable = true;
                 };
 
@@ -98,8 +100,6 @@
 
                     code-server.enable = true;
 
-                minecraft.enable = true;
-
                     sandbox.enable = false;
                 };
 
@@ -112,4 +112,5 @@
 
         };
 
+    };
 }

profiles/iso/default.nix

@@ -1,4 +1,6 @@
-{ lib, pkgs, inputs, modulesPath, ... }: {
+{ inputs, ... }: {
+
+    flake.nixosModules.iso = { lib, pkgs, modulesPath, ... }: {
 
         imports = with inputs; [
 
@@ -61,11 +63,12 @@
                                     hyprlock.enable = true;
                                     wal.enable = true;
                                     mpd.enable = true;
-                                hyprpanel.enable = true;
                                     rofi.enable = true;
                                     firefox.enable = true;
                                     git.enable = false;
                                     nh.enable = true;
+
+                                    aurora.enable = true;
                                 };
                             } 
                             ];
@@ -77,13 +80,13 @@
                     sddm.enable = true;
                     openssh.enable = true;
                     pipewire.enable = true;
-                #kdePlasma6.enable = true;
+#kdePlasma6.enable = true;
                     netbird.enable = true;
-                #ollama.enable = true;
+#ollama.enable = true;
                 };
 
                 programs = {
-                #steam.enable = true;
+#steam.enable = true;
                     hyprpanel.enable = true;
                     hyprland.enable = true;
                 };
@@ -102,5 +105,6 @@
             };
 
 
+        };
     };
 }

profiles/jesstop/default.nix

@@ -1,11 +1,11 @@
-{ config, pkgs, lib, inputs, ... }:
+{ inputs, ... }: {
 
-{
+    flake.nixosModules.jesstop = { config, pkgs, lib, ... }:
+
+    {
 
         imports = [
-        ./hardware-configuration.nix
+#inputs.home-manager.nixosModules.default
-
-        #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 ];
 
 
+        };
     };
 }

profiles/jesstop/hardware-configuration.nix

@@ -1,9 +1,8 @@
-# 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 =
             [ (modulesPath + "/installer/scan/not-detected.nix")
             ];
@@ -26,14 +25,15 @@
 
         swapDevices = [ ];
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
+# (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
+# still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
         networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
+# networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
 
         nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
         hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    };
 }

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,11 +56,11 @@
                     pipewire.enable = mkDefault true;
                     netbird.enable = mkDefault true;
                     ollama.enable = mkDefault true;
+                    avahi.enable = mkDefault true;
                 };
 
                 programs = {
                     steam.enable = mkDefault true;
-                hyprpanel.enable = mkDefault true;
                     hyprland.enable = mkDefault true;
                 };
 
@@ -83,17 +85,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 +113,5 @@
 
         };
 
+    };
 }

profiles/live/default.nix

@@ -1,4 +1,6 @@
-{ pkgs, inputs, ... }: {
+{ inputs, ... }: {
+
+    flake.nixosModules.live = { pkgs, ... }: {
 
         imports = with inputs; [
 
@@ -47,17 +49,17 @@
                 age.keyFile = "/var/lib/sops/age/keys.txt";
                 defaultSopsFile = ./secrets.yaml;
                 defaultSopsFormat = "yaml";
-            #secrets."nathan/pass".neededForUsers = true;
+#secrets."nathan/pass".neededForUsers = true;
             };
 
             sysconfig = {
-            #remoteBuildClient = true;
+#remoteBuildClient = true;
                 host = "live";
                 graphical = true;
                 users = {
                     nathan = {
                         extraGroups = [ "wheel" "networkmanager" ];
-                    #hashedPasswordFile = config.sops.secrets."nathan/pass".path;
+#hashedPasswordFile = config.sops.secrets."nathan/pass".path;
                         shell = pkgs.zsh;
                         sshKeys = [
                             "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAsU69CxfQk58CvItPN426h5Alnpb60SH37wet97Vb57 nathan@laptop"
@@ -73,12 +75,12 @@
                                     hyprlock.enable = true;
                                     wal.enable = true;
                                     mpd.enable = true;
-                                hyprpanel.enable = true;
                                     calcurse.enable = true;
                                     rofi.enable = true;
                                     firefox.enable = true;
-                                #git.enable = true;
+#git.enable = true;
                                     nh.enable = true;
+                                    aurora.enable = true;
                                 };
                             } 
                             ];
@@ -90,13 +92,13 @@
                     sddm.enable = true;
                     openssh.enable = true;
                     pipewire.enable = true;
-                #kdePlasma6.enable = true;
+#kdePlasma6.enable = true;
                     netbird.enable = true;
-                #ollama.enable = true;
+#ollama.enable = true;
                 };
 
                 programs = {
-                #steam.enable = true;
+#steam.enable = true;
                     hyprpanel.enable = true;
                     hyprland.enable = true;
                 };
@@ -118,4 +120,5 @@
 
             fonts.packages = with pkgs; [ nerd-fonts.fira-code ];
         };
+    };
 }

profiles/live/disko.nix

@@ -1,7 +1,9 @@
-{
+{ ... }: {
+
+    flake.diskoConfigurations.live = {
         device1 ? throw "Set this to your disk device, e.g. /dev/sda",
         ...
-}: {
+    }: {
         disko.devices = {
             disk = {
                 main = {
@@ -63,4 +65,5 @@
                 };
             };    
         };
+    };
 }

profiles/pi4/default.nix

@@ -1,4 +1,6 @@
-{ config, pkgs, inputs, ... }: {
+{ inputs, ... }: {
+
+    flake.nixosModules.pi4 = { config, pkgs, ... }: {
 
         imports = [
             ./hardware-configuration.nix
@@ -54,7 +56,7 @@
 
                 services = {
                     openssh.enable = true;
-                #pipewire.enable = true;
+#pipewire.enable = true;
                     netbird.enable = true;
                 };
             };
@@ -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";
         };
+    };
 }

profiles/pi4/disko.nix

@@ -1,7 +1,9 @@
-{
+{ ... }: {
+
+    flake.diskoConfigurations.pi4 = {
         device1 ? throw "Set this to your disk device, e.g. /dev/sda",
         ...
-}: {
+    }: {
         disko.devices = {
             disk = {
                 main = {
@@ -63,4 +65,5 @@
                 };
             };    
         };
+    };
 }

profiles/pi4/hardware-configuration.nix

@@ -1,9 +1,8 @@
-# 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 =
             [ (modulesPath + "/installer/scan/not-detected.nix")
             ];
@@ -15,13 +14,14 @@
 
         swapDevices = [ ];
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
+# (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
+# still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
         networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.end0.useDHCP = lib.mkDefault true;
+# networking.interfaces.end0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
+# networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
 
         nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
+    };
 }

system/default.nix

@@ -1,11 +1,6 @@
-{ config, lib, pkgs, nixpkgs, ... }: {
+{ inputs, ... }: {
 
-    imports = let 
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {
-        dir = builtins.readDir ./.;
-    in builtins.map (x: ./${x}) (builtins.filter 
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    );
 
         options.sysconfig = with lib; {
             host = mkOption {
@@ -31,7 +26,7 @@
             networking.hostName = lib.mkDefault config.sysconfig.host;
 
             nix = {
-            nixPath = [ "nixpkgs=${nixpkgs}" ];
+                nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
                 channel.enable = false;
                 settings = {
                     experimental-features = [ "nix-command" "flakes" ];
@@ -112,4 +107,6 @@
                 };
             };
         };
+    };
 }
+

system/etc/default.nix

@@ -1,6 +1,10 @@
 { ... }: {
     
+
+    flake.nixosModules.default = { ... }: {
+
         config = {
 
         };
+    };
 }

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 
         ];
+    };
 }
+

system/programs/default.nix

@@ -1,9 +0,0 @@
-{ ... }: {
-
-    imports = [
-        ./hyprland
-	    ./hyprpanel
-        ./steam
-    ];
-}
-

system/programs/hyprland/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, pkgs, hyprland, ... }: {
+{ inputs, ... }: {
+
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {
 
         options.sysconfig.programs.hyprland.enable = lib.options.mkOption {
             type = lib.types.bool;
@@ -11,18 +13,44 @@
 
             environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
-        programs.hyprland = {
+            programs.hyprland = let
+                system = pkgs.stdenv.hostPlatform.system;
+                #pkgs-us = import inputs.nixpkgs-us { inherit system; };
+            in {
                 enable = true;
 
-            withUWSM = true;
+                withUWSM = false;
 
                 xwayland.enable = true;
 
                 systemd.setPath.enable = true;
 
-            package = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+                package = inputs.hyprland.packages.${system}.hyprland;
 
-            portalPackage = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
+                portalPackage = inputs.hyprland.packages.${system}.xdg-desktop-portal-hyprland;
+            };
+
+            services = {
+                upower.enable = true;
+                gvfs.enable = true;
+                power-profiles-daemon.enable = true;
+            };
+
+            environment.systemPackages = with pkgs; [
+                bluez
+                bluez-tools
+                libgtop
+                dart-sass
+                wl-clipboard
+                gtksourceview
+                libsoup_3
+                brightnessctl
+                swww
+                hyprpicker
+                hyprsunset
+                wf-recorder
+            ];
         };
     };
 }
+

system/programs/hyprpanel/default.nix

@@ -1,30 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    options.sysconfig.programs.hyprpanel.enable = lib.options.mkOption {
-        type = lib.types.bool;
-	    default = false;
-	};
-
-    config = lib.mkIf config.sysconfig.programs.hyprpanel.enable {
-        services = {
-            upower.enable = true;
-            gvfs.enable = true;
-            power-profiles-daemon.enable = true;
-        };
-
-        environment.systemPackages = with pkgs; [
-            bluez
-            bluez-tools
-            libgtop
-            dart-sass
-            wl-clipboard
-            gtksourceview
-            libsoup_3
-            brightnessctl
-            swww
-            hyprpicker
-            hyprsunset
-            wf-recorder
-        ];
-    };
-}

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;
             };
         };
+    };
 }
+

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;
+
+            };   
+        };
+    };
+}
+

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)
-    );
-}

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 = '''';
             };
         };
+    };
 }
+

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
             ];
         };
+    };
 }
+

system/services/netbird/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, nixpkgs-us, ... }: {
+{ inputs, ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {
 
         options.sysconfig = {
 
@@ -9,7 +11,7 @@
         };
 
         config = let 
-        pkgs-us = import nixpkgs-us {
+            pkgs-us = import inputs.nixpkgs-us {
                 system = "x86_64-linux";
             };
         in lib.mkIf config.sysconfig.services.netbird.enable {
@@ -23,4 +25,6 @@
                 package =   pkgs-us.netbird;
             };
         };
+    };
 }
+

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 ];
         };
+    };
 }
+

system/services/ollama/default.nix

@@ -1,4 +1,6 @@
-{ config, lib, nixpkgs-us, ... }: {
+{ inputs, ... }: {
+
+    flake.nixosModules.default = { config, lib, ... }: {
 
         options = {
             sysconfig.services.ollama.enable = lib.options.mkOption {
@@ -15,11 +17,13 @@
                     OLLAMA_CONTEXT_LENGTH = lib.mkDefault "16000";
                 };
                 package = let 
-                pkgs-us = import nixpkgs-us { 
+                    pkgs-us = import inputs.nixpkgs-us { 
                         system = "x86_64-linux";
                         config.allowUnfree = true;
                     }; 
                 in pkgs-us.ollama-cuda;
             };
         };
+    };
 }
+

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 @@
                 };
             };
         };
+    };
 }
+

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 {
@@ -10,7 +12,7 @@
         config = lib.mkIf config.sysconfig.services.pipewire.enable {
 
 # Enable sound with pipewire.
-        #sound.enable = true;
+#sound.enable = true;
 
             security.rtkit.enable = true;
             services.pipewire = {
@@ -48,4 +50,5 @@
         };
 
 
+    };
 }

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 @@
                 ];
             };
         };
+    };
 }

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 @@
             };
 
         };
+    };
 }

system/users/default.nix

@@ -1,11 +1,6 @@
-{ config, lib, pkgs, ... } @ inputs: {
+{ self, ... }: {
 
-    imports = let 
+    flake.nixosModules.default = { config, lib, pkgs, ... }: {
-        dir = builtins.readDir ./.;
-    in builtins.map (x: ./${x}) (builtins.filter 
-        (file: (dir.${file} == "directory"))
-        (builtins.attrNames dir)
-    );
 
         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 
+                            (lib.mkIf (self.homeModules ? ${x}) self.homeModules.${x})
-                            dir = builtins.readDir ./.; 
-                        in dir ? ${x} && dir.${x} == "directory" then 
-                            import ../../homes/${x}/home-manager 
-                        else {})
-
-                        (if inputs ? ${x} then inputs.${x} else {})
 
                          ] ++ config.sysconfig.users.${x}.home-manager.extraModules));
                     })
@@ -140,5 +128,11 @@
                 );
 
             };
+
+            nix.settings.trusted-users = (builtins.filter 
+                (y: config.sysconfig.users.${y}.isSuperuser)
+                (builtins.attrNames config.sysconfig.users)
+            );
+        };
     };
 }

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
@@ -10,7 +12,7 @@
                 shell = lib.mkDefault pkgs.zsh;
                 name = lib.mkDefault "nathan";
                 isNormalUser = lib.mkDefault true;
-            #hashedPasswordFile = lib.mkIf (cfg.hashedPasswordFile != null) cfg.hashedPasswordFile;
+#hashedPasswordFile = lib.mkIf (cfg.hashedPasswordFile != null) cfg.hashedPasswordFile;
                 extraGroups = [ "networkmanager" "docker" "libvirtd" ];
                 openssh.authorizedKeys.keys = with config.sysconfig.users.nathan; lib.mkIf config.sysconfig.services.openssh.enable (
                         ssh.keys ++ (map (z: config.sysconfig.sshHostKeys.${z}) ssh.hosts)
@@ -21,4 +23,5 @@
 
             };
         };
+    };
 }

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";
-            };
-        };
-    };
-}

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 @@
                 };
             };
         };
+    };
 }

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
-    ];*/
-}

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 @@
                 };
             };
         };
+    };
 }

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";
-            };
-        };
-    };
-}

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";
-            };
-        };
-    };
-}

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";
-            };
-        };
-    };
-}