Begin Dendritic rewrite

flake-parts.nix

@@ -4,4 +4,9 @@
         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,26 @@
         "type": "github"
       }
     },
+    "aurora": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "import-tree": "import-tree",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1772805975,
+        "narHash": "sha256-h+Ifi8IdFp/MFrquO4F20c/gPzD7CN5ybyjekeJkwcE=",
+        "ref": "refs/heads/master",
+        "rev": "93c1b00adcf1baff37ec99337691438915797d85",
+        "revCount": 1,
+        "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 +60,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 +81,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 +111,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 +165,7 @@
         "type": "github"
       }
     },
-    "flake-parts_2": {
+    "flake-parts_4": {
       "inputs": {
         "nixpkgs-lib": [
           "nixvim",
@@ -176,11 +216,11 @@
         ]
       },
       "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 +275,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 +299,17 @@
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
         "hyprwire": "hyprwire",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1770079745,
+        "lastModified": 1772833450,
-        "narHash": "sha256-rQ4no/+LHuHlqDbJopj6fgS9GUsv1NSycrVhIoLPnbs=",
+        "narHash": "sha256-W/2pHWOVr+jCr/Bzm1mndsZdg7kWjYsYsouLk1nCLLk=",
         "ref": "refs/heads/main",
-        "rev": "30756d871845a6058a840642ab1a4c3979f6d782",
+        "rev": "4152ac76d0813d9d0f67d2f04653a13fa6e17433",
-        "revCount": 6859,
+        "revCount": 6996,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -367,11 +407,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 +484,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 +509,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 +538,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,43 +551,83 @@
         "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": 1772433332,
-        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
+        "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
+        "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "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 +644,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,15 +660,15 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1769461804,
+        "lastModified": 1772198003,
-        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
+        "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
+        "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -596,11 +676,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1770056022,
+        "lastModified": 1772598333,
-        "narHash": "sha256-yvCz+Qmci1bVucXEyac3TdoSPMtjqVJmVy5wro6j/70=",
+        "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d04d8548aed39902419f14a8537006426dc1e4fa",
+        "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239",
         "type": "github"
       },
       "original": {
@@ -644,7 +724,7 @@
     },
     "nixvim": {
       "inputs": {
-        "flake-parts": "flake-parts",
+        "flake-parts": "flake-parts_3",
         "nixpkgs": "nixpkgs_4",
         "nixvim": "nixvim_2"
       },
@@ -664,9 +744,9 @@
     },
     "nixvim_2": {
       "inputs": {
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts_4",
         "nixpkgs": "nixpkgs_5",
-        "systems": "systems_3"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1769644746,
@@ -692,11 +772,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,11 +787,13 @@
     },
     "root": {
       "inputs": {
+        "aurora": "aurora",
         "disko": "disko",
         "firefox-addons": "firefox-addons",
+        "flake-parts": "flake-parts_2",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
-        "nix-minecraft": "nix-minecraft",
+        "import-tree": "import-tree_2",
         "nixpkgs": "nixpkgs_3",
         "nixpkgs-us": "nixpkgs-us",
         "nixvim": "nixvim",
@@ -725,11 +807,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 +850,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

@@ -30,8 +30,6 @@
             inputs.nixpkgs.follows = "nixpkgs";
         };
 
-        nix-minecraft.url = "github:Infinidoge/nix-minecraft";
-
         hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
 
         nixvim.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai";
@@ -49,5 +47,6 @@
         ./machines 
         ./system 
         ./templates/default.nix
+        ./flake-parts.nix
     ]);
 }

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

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

profiles/container/default.nix

@@ -1,6 +1,6 @@
-{ ... }: {
+{ inputs, ... }: {
 
-    flake.nixosModules.container = { config, pkgs, lib, inputs, ... }:
+    flake.nixosModules.container = { config, pkgs, lib, ... }:
 
     {
         imports =

profiles/homebox/default.nix

@@ -1,15 +1,15 @@
-{ ... }: {
+{ inputs, ... }: {
 
-    flake.nixosModules.homebox = { config, pkgs, lib, disko, sops-nix, home-manager, ... }:
+    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
 
             ];
 
@@ -101,8 +101,6 @@
 
                     code-server.enable = true;
 
-                    minecraft.enable = true;
-
                     sandbox.enable = false;
                 };
 

profiles/iso/default.nix

@@ -1,6 +1,6 @@
-{ ... }: {
+{ inputs, ... }: {
 
-    flake.nixosModules.iso = { lib, pkgs, inputs, modulesPath, ... }: {
+    flake.nixosModules.iso = { lib, pkgs, modulesPath, ... }: {
 
         imports = with inputs; [
 

profiles/jesstop/default.nix

@@ -1,12 +1,10 @@
-{ ... }: {
+{ inputs, ... }: {
 
-    flake.nixosModules.jesstop = { config, pkgs, lib, inputs, ... }:
+    flake.nixosModules.jesstop = { config, pkgs, lib, ... }:
 
     {
 
         imports = [
-            ./hardware-configuration.nix
-
 #inputs.home-manager.nixosModules.default
 
                 inputs.sops-nix.nixosModules.sops

profiles/laptop/default.nix

@@ -1,13 +1,13 @@
-{ ... }: {
+{ inputs, ... }: {
 
-    flake.nixosModules.laptop = { config, pkgs, lib, home-manager, sops-nix, ... }:
+    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 = {

profiles/live/default.nix

@@ -1,6 +1,6 @@
-{ ... }: {
+{ inputs, ... }: {
 
-    flake.nixosModules.live = { pkgs, inputs, ... }: {
+    flake.nixosModules.live = { pkgs, ... }: {
 
         imports = with inputs; [
 

profiles/live/disko.nix

@@ -65,5 +65,5 @@
                 };
             };    
         };
-    }
+    };
 }

profiles/pi4/default.nix

@@ -1,6 +1,6 @@
-{ ... }: {
+{ inputs, ... }: {
 
-    flake.nixosModules.pi4 = { config, pkgs, inputs, ... }: {
+    flake.nixosModules.pi4 = { config, pkgs, ... }: {
 
         imports = [
             ./hardware-configuration.nix

system/default.nix

@@ -108,5 +108,5 @@
             };
         };
     };
-};
+}
 

templates/default.nix

@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.templates = {
+    /*flake.templates = {
         nixos = {
             welcomeText = ''
                 #Welcome to Olympus!
@@ -28,19 +28,5 @@
             path = ./home-manager;
 
         };
-
+    };*/
-        nix-on-droid = {
-            welcomeText = ''
-                #Welcome to Olympus!
-                Have Fun!
-            '';
-
-            description = ''
-                Generate this where you want your config.
-            '';
-
-            path = ./nix-on-droid;
-
-        };
-    };
 }

templates/home-manager/home.nix

@@ -1,90 +1 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, ... }:
-
-{
-
-    imports = [ # Include the results of the hardware scan.
-        ./hardware-configuration.nix
-    ];
-
-    config = {
-  
-        boot.kernelParams = [ "snd-intel-dspcfg.dsp_driver=1" ];
-
-        hardware.nvidia = {
-            modesetting.enable = true;
-            powerManagement.enable = true;
-            powerManagement.finegrained = true;
-            open = false;
-            nvidiaSettings = true;
-            package = config.boot.kernelPackages.nvidiaPackages.stable;
-
-            prime = {
-# Make sure to use the correct Bus ID values for your system!
-                intelBusId = "PCI:0:2:0";
-                nvidiaBusId = "PCI:1:0:0";
-# WARNING: sync and offload are mutually exclusive.
-# You can only pick one!!
-#sync.enable = true;
-                offload = {
-                    enable = true;
-                    enableOffloadCmd = true;
-                };
-            };
-        };
-
-        sysconfig = {
-            users = {
-                nathan = {
-                    isSuperuser = true;
-                    extraGroups = [ "networkmanager" ];
-                    hashedPasswordFile = config.sops.secrets."nathan/pass".path;
-                    shell = pkgs.zsh;
-                    home-manager = {
-                        enable = true;
-                        standalone = false;
-                        extraModules = [
-                        {
-                            homeconfig = {
-                                minimal = false;
-                                hyprland.enable = true;
-                                hyprlock.enable = true;
-                                wal.enable = true;
-                                mpd.enable = true;
-                                hyprpanel.enable = true;
-                                calcurse.enable = true;
-                                rofi.enable = true;
-                                firefox.enable = true;
-                                git.enable = true;
-                                nh.enable = true;
-                            };
-
-                            #monitor=eDP-1, addreserved, 40,0,0,0
-                            wayland.windowManager.hyprland.extraConfig = ''
-                                monitor=eDP-1,1920x1080@60,0x0,1
-                            '';
-
-                        } 
-                        ];
-                    };
-                };
-            };
-        };
-
-
-        services.xserver.videoDrivers = [ "nvidia" ];
-
-
-# This value determines the NixOS release from which the default
-# settings for stateful data, like file locations and database versions
-# on your system were taken. It‘s perfectly fine and recommended to leave
-# this value at the release version of the first install of this system.
-# Before changing this value read the documentation for this option
-# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-        system.stateVersion = "23.05"; # Did you read the comment?
-    };
-
-}

templates/nix-on-droid/.sops.yaml

@@ -1,33 +0,0 @@
-keys:
-  - &homebox age1640eg0pnmkruc89m5xguz0m8fek44fl4tzez6qwuzlz6kmapqewsp8esxd
-  - &laptop age1yqgyp2uxz4lzrc9f9ka0mfjl5fr6ahf8nf24nlmran2wulg6fpvq9hyp9q
-  - &android age12pnf36uqesjmy3e0lythfnpwam3zg5mv8m936fc4jphy4ces2fdqwn0s74
-creation_rules:
-  - path_regex: homebox/secrets.yaml$
-    key_groups:
-    - age:
-      - *homebox
-  - path_regex: laptop/secrets.yaml$
-    key_groups:
-    - age:
-      - *laptop
-  - path_regex: pi4/secrets.yaml$
-    key_groups:
-    - age:
-      - *laptop
-  - path_regex: live/secrets.yaml$
-    key_groups:
-    - age:
-      - *laptop
-  - path_regex: nathan/secrets.yaml$
-    key_groups:
-    - age:
-      - *laptop
-      - *homebox
-      - *android
-  - path_regex: system-config/secrets.yaml$
-    key_groups:
-    - age:
-      - *laptop
-      - *homebox
-      - *android

templates/nix-on-droid/configuration.nix

@@ -1,90 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, ... }:
-
-{
-
-    imports = [ # Include the results of the hardware scan.
-        ./hardware-configuration.nix
-    ];
-
-    config = {
-  
-        boot.kernelParams = [ "snd-intel-dspcfg.dsp_driver=1" ];
-
-        hardware.nvidia = {
-            modesetting.enable = true;
-            powerManagement.enable = true;
-            powerManagement.finegrained = true;
-            open = false;
-            nvidiaSettings = true;
-            package = config.boot.kernelPackages.nvidiaPackages.stable;
-
-            prime = {
-# Make sure to use the correct Bus ID values for your system!
-                intelBusId = "PCI:0:2:0";
-                nvidiaBusId = "PCI:1:0:0";
-# WARNING: sync and offload are mutually exclusive.
-# You can only pick one!!
-#sync.enable = true;
-                offload = {
-                    enable = true;
-                    enableOffloadCmd = true;
-                };
-            };
-        };
-
-        sysconfig = {
-            users = {
-                nathan = {
-                    isSuperuser = true;
-                    extraGroups = [ "networkmanager" ];
-                    hashedPasswordFile = config.sops.secrets."nathan/pass".path;
-                    shell = pkgs.zsh;
-                    home-manager = {
-                        enable = true;
-                        standalone = false;
-                        extraModules = [
-                        {
-                            homeconfig = {
-                                minimal = false;
-                                hyprland.enable = true;
-                                hyprlock.enable = true;
-                                wal.enable = true;
-                                mpd.enable = true;
-                                hyprpanel.enable = true;
-                                calcurse.enable = true;
-                                rofi.enable = true;
-                                firefox.enable = true;
-                                git.enable = true;
-                                nh.enable = true;
-                            };
-
-                            #monitor=eDP-1, addreserved, 40,0,0,0
-                            wayland.windowManager.hyprland.extraConfig = ''
-                                monitor=eDP-1,1920x1080@60,0x0,1
-                            '';
-
-                        } 
-                        ];
-                    };
-                };
-            };
-        };
-
-
-        services.xserver.videoDrivers = [ "nvidia" ];
-
-
-# This value determines the NixOS release from which the default
-# settings for stateful data, like file locations and database versions
-# on your system were taken. It‘s perfectly fine and recommended to leave
-# this value at the release version of the first install of this system.
-# Before changing this value read the documentation for this option
-# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-        system.stateVersion = "23.05"; # Did you read the comment?
-    };
-
-}

templates/nix-on-droid/flake.nix

@@ -1,50 +0,0 @@
-{
-
-    description = "System Configuration";
-
-    inputs = {
-
-        nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
-
-        home-manager = {
-            url = "github:nix-community/home-manager/release-25.05";
-            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, olympus, ... }: let
-        host = "hostname";
-
-    in {
-
-        nixosConfigurations."${host}" = nixpkgs.lib.nixosSystem {
-
-            specialArgs = {
-            };
-
-            modules = [
-                { sysconfig.host = host; }
-                ./configuration.nix
-                olympus.live
-            ];
-        };
-
-        templates.default = {
-            welcomeText = ''
-                # NixOS Configuration Template
-                Have Fun!
-            '';
-            description = ''
-                Generate this where you want your config.
-            '';
-            source = ./.;
-        };
-
-    };
-}