diff --git a/flake.lock b/flake.lock
index 726a0e1..39fccf7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -374,28 +374,6 @@
         "type": "github"
       }
     },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nix-on-droid",
-          "nixpkgs"
-        ],
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1663932797,
-        "narHash": "sha256-IH8ZBW99W2k7wKLS+Sat9HiKX1TPZjFTnsPizK5crok=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "de3758e31a3a1bc79d569f5deb5dac39791bf9b6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "lib-aggregate": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -533,7 +511,9 @@
     },
     "nix-on-droid": {
       "inputs": {
-        "home-manager": "home-manager_2",
+        "home-manager": [
+          "home-manager"
+        ],
         "nix-formatter-pack": "nix-formatter-pack",
         "nixpkgs": [
           "nixpkgs"
@@ -881,22 +861,6 @@
         "type": "github"
       }
     },
-    "old-nixpkgs": {
-      "locked": {
-        "lastModified": 1688392541,
-        "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "release-22.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "org": {
       "flake": false,
       "locked": {
@@ -1010,9 +974,7 @@
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_4",
         "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap_2",
-        "old-nixpkgs": "old-nixpkgs",
-        "robotnix": "robotnix",
-        "rpi-nixpkgs": "rpi-nixpkgs"
+        "robotnix": "robotnix"
       }
     },
     "rotate-text": {
@@ -1031,22 +993,6 @@
         "type": "github"
       }
     },
-    "rpi-nixpkgs": {
-      "locked": {
-        "lastModified": 1688392541,
-        "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-22.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "sln-mode": {
       "flake": false,
       "locked": {
@@ -1124,21 +1070,6 @@
         "type": "github"
       }
     },
-    "utils": {
-      "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "ws-butler": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index f6ae1ec..75dc3be 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,9 +4,10 @@
 	inputs = {
 		#nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 		nixpkgs.url = "github:NixOS/nixpkgs/release-23.05";
-		old-nixpkgs.url = "github:NixOS/nixpkgs/release-22.11";
+		
+    #old-nixpkgs.url = "github:NixOS/nixpkgs/release-22.11";
 
-    rpi-nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
+    #rpi-nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
 
 
 		firefox.url = "github:nix-community/flake-firefox-nightly";
@@ -44,6 +45,7 @@
       url = "github:nix-community/nix-on-droid/release-23.05";
       #url = "github:zhaofengli/nix-on-droid";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.home-manager.follows = "home-manager";
     };
     # for bootstrap zip ball creation and proot-termux builds, we use a fixed version of nixpkgs to ease maintanence.
     # head of nixos-23.05 as of 2023-06-18
@@ -178,12 +180,12 @@
               inherit self;
               hostname = "phone";
               #pkgs = old-nixpkgs.x86_64
-              pkgs = import inputs.old-nixpkgs { system = "aarch64-linux"; config = {
-                allowUnfree = true;
-                permittedInsecurePackages = [
-                  "electron-24.8.6"
-                  ];
-              }; };
+              #pkgs = import inputs.old-nixpkgs { system = "aarch64-linux"; config = {
+                #allowUnfree = true;
+                #permittedInsecurePackages = [
+                  #"electron-24.8.6"
+                  #];
+              #}; };
             };
             home-manager.useGlobalPkgs = true;