diff --git a/flake.nix b/flake.nix index 00d5a33..ea3e50f 100644 --- a/flake.nix +++ b/flake.nix @@ -197,7 +197,7 @@ }; nixOnDroidConfigurations = { - "socrates" = mkDroid [./hosts/socrates]; + "enchilada" = mkDroid [./hosts/enchilada]; }; colmena = { diff --git a/hosts/socrates/default.nix b/hosts/enchilada/default.nix similarity index 99% rename from hosts/socrates/default.nix rename to hosts/enchilada/default.nix index aae75f6..2da5845 100644 --- a/hosts/socrates/default.nix +++ b/hosts/enchilada/default.nix @@ -8,6 +8,7 @@ environment.packages = with pkgs; [ git openssh + curl diffutils findutils diff --git a/hosts/socrates/robotnix/disable-gapps.patch b/hosts/socrates/robotnix/disable-gapps.patch deleted file mode 100644 index 0db05e6..0000000 --- a/hosts/socrates/robotnix/disable-gapps.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- - lineage_socrates.mk | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/lineage_socrates.mk b/lineage_socrates.mk -index c3e5c0a..f9f0f74 100644 ---- a/lineage_socrates.mk -+++ b/lineage_socrates.mk -@@ -14,9 +14,6 @@ $(call inherit-product, vendor/lineage/config/common_full_phone.mk) - # Inherit device configurations - $(call inherit-product, device/xiaomi/socrates/device.mk) - --# Inherit from Gapps --$(call inherit-product, vendor/gapps/arm64/arm64-vendor.mk) -- - ## Device identifier - PRODUCT_DEVICE := socrates - PRODUCT_NAME := lineage_socrates --- -2.44.0 - diff --git a/hosts/socrates/robotnix/flake.lock b/hosts/socrates/robotnix/flake.lock deleted file mode 100644 index 8e55133..0000000 --- a/hosts/socrates/robotnix/flake.lock +++ /dev/null @@ -1,130 +0,0 @@ -{ - "nodes": { - "androidPkgs": { - "inputs": { - "devshell": "devshell", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1638562808, - "narHash": "sha256-nnGyBugMQo9WweTgpfPbJu0fHnRtxvsPQ9el2D3wPrY=", - "owner": "tadfisher", - "repo": "android-nixpkgs", - "rev": "a191ab6adb019b09d3bb919bb98dca31d83519d5", - "type": "github" - }, - "original": { - "owner": "tadfisher", - "ref": "stable", - "repo": "android-nixpkgs", - "type": "github" - } - }, - "devshell": { - "locked": { - "lastModified": 1637575296, - "narHash": "sha256-ZY8YR5u8aglZPe27+AJMnPTG6645WuavB+w0xmhTarw=", - "owner": "numtide", - "repo": "devshell", - "rev": "0e56ef21ba1a717169953122c7415fa6a8cd2618", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "flake-utils": { - "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1637841632, - "narHash": "sha256-QYqiKHdda0EOnLGQCHE+GluD/Lq2EJj4hVTooPM55Ic=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "73369f8d0864854d1acfa7f1e6217f7d6b6e3fa1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgsUnstable": { - "locked": { - "lastModified": 1638376152, - "narHash": "sha256-ucgLpVqhFnClH7YRUHBHnmiOd82RZdFR3XJt36ks5fE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6daa4a5c045d40e6eae60a3b6e427e8700f1c07f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1638371214, - "narHash": "sha256-0kE6KhgH7n0vyuX4aUoGsGIQOqjIx2fJavpCWtn73rc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a640d8394f34714578f3e6335fc767d0755d78f9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-21.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "robotnix": { - "inputs": { - "androidPkgs": "androidPkgs", - "nixpkgs": "nixpkgs_2", - "nixpkgsUnstable": "nixpkgsUnstable" - }, - "locked": { - "lastModified": 1699510635, - "narHash": "sha256-OpScLedUNJ6xyEyd5PeAMNKaoi8LMI7RT1lzXPp+UaY=", - "owner": "danielfullmer", - "repo": "robotnix", - "rev": "f941a20537384418c22000f6e6487c92441e0a7f", - "type": "github" - }, - "original": { - "owner": "danielfullmer", - "repo": "robotnix", - "type": "github" - } - }, - "root": { - "inputs": { - "robotnix": "robotnix" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/hosts/socrates/robotnix/flake.nix b/hosts/socrates/robotnix/flake.nix deleted file mode 100644 index 472b9f8..0000000 --- a/hosts/socrates/robotnix/flake.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - description = "Build LineageOS for Redmi K60 Pro"; - - inputs.robotnix.url = "github:danielfullmer/robotnix"; - - outputs = inputs: { - packages.x86_64-linux.default = inputs.self.robotnixConfigurations."socrates".img; - - robotnixConfigurations."socrates" = inputs.robotnix.lib.robotnixSystem ({pkgs, ...}: { - device = "socrates"; - flavor = "lineageos"; - androidVersion = 14; - - apps.chromium.enable = false; - webview.chromium.enable = false; - - ccache.enable = true; - - source.dirs."device/xiaomi/socrates".src = pkgs.fetchFromGitHub { - owner = "danielml3"; - repo = "android_device_xiaomi_socrates"; - rev = "8b48a7a18b8db76d7122ca6e1b5bde8765d16665"; # lineage-21 - hash = "sha256-pQIbxpZhaxc7nI8Pl8sjG3kmvD3ComFDowjcKb9eZRo="; - }; - - source.dirs."device/xiaomi/socrates-kernel".src = pkgs.fetchFromGitHub { - owner = "danielml3"; - repo = "android_device_xiaomi_socrates"; - rev = "60cd3aebf59cdf96366e8e4a8a1e2887f7d4d063"; # lineage-21-kernel - hash = "sha256-i5QtxvApvGk24WeH6i6nC6jhS2jL2BolRUr/M02y6lc="; - }; - - source.dirs."hardware/xiaomi".src = pkgs.fetchFromGitHub { - owner = "LineageOS"; - repo = "android_hardware_xiaomi"; - rev = "4453055456bb452830144d9526342b032289495e"; # lineage-21 - hash = "sha256-kQoHGKsa5L+usIChTMm63P85N8ZGofcllE4Hybf7itA="; - }; - - # TODO: - source.dirs."vendor/xiaomi/socrates".src = pkgs.fetchFromGitHub { - owner = "kmiit"; - repo = "android_vendor_xiaomi_socrates"; - rev = ""; - hash = ""; - }; - }); - }; -}