From 3677857763b08d9cb5542f3cd0b47f7a3897d672 Mon Sep 17 00:00:00 2001
From: randomuser <randomuser@tilde.club>
Date: Sat, 10 Feb 2024 18:42:50 -0600
Subject: [PATCH] restructure flake to make it more appearant what's going on

---
 flake.nix | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7b8f4c7..8acc27f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,16 +2,12 @@
   description = "rndusr's nixos flake";
 
   inputs = {
+    # regular nixos stuff
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
-    phone-nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
     home-manager = {
       url = "github:nix-community/home-manager/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    home-manager-phone = {
-      url = "github:nix-community/home-manager/release-23.05";
-      inputs.nixpkgs.follows = "phone-nixpkgs";
-    };
     firefox-addons = {
       url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -19,6 +15,13 @@
     simple-nixos-mailserver = {
       url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11";
     };
+
+    # nix-on-droid inputs
+    phone-nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    home-manager-phone = {
+      url = "github:nix-community/home-manager/release-23.05";
+      inputs.nixpkgs.follows = "phone-nixpkgs";
+    };
     nix-on-droid = {
       url = "github:t184256/nix-on-droid/release-23.05";
       inputs.nixpkgs.follows = "phone-nixpkgs";
@@ -26,15 +29,25 @@
     };
   };
 
-  outputs = { self, nixpkgs, phone-nixpkgs, home-manager, home-manager-phone, firefox-addons, simple-nixos-mailserver, nix-on-droid, ... }@inputs: {
+  outputs = {
+      self,
+      nixpkgs,
+      home-manager,
+      firefox-addons,
+      simple-nixos-mailserver,
+
+      phone-nixpkgs,
+      home-manager-phone,
+      nix-on-droid,
+    ... }@inputs: {
     nixOnDroidConfigurations = {
       phone = nix-on-droid.lib.nixOnDroidConfiguration {
         modules = [
-	  ./boxes/phone
-	];
+          ./boxes/phone
+        ];
       };
     };
-    
+
     nixosConfigurations = {
       netbox = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";