From 7067f8757cafc369e5918538c5860241804f5121 Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Wed, 21 Aug 2024 11:27:31 +0300 Subject: [PATCH] Package : Remove android apks. --- home/Android.nix | 2 +- home/HomeManager.nix | 2 -- host/home/default.nix | 1 - module/Package.nix | 6 ----- package/apks/default.nix | 58 ---------------------------------------- package/default.nix | 4 --- 6 files changed, 1 insertion(+), 72 deletions(-) delete mode 100644 package/apks/default.nix diff --git a/home/Android.nix b/home/Android.nix index 19edba8..e1e1123 100644 --- a/home/Android.nix +++ b/home/Android.nix @@ -23,7 +23,7 @@ in { config = mkIf cfg.enable { time.timeZone = const.timeZone; - environment.packages = package.core ++ package.android; + environment.packages = package.core; home-manager.config = stylix // { imports = [ inputs.stylix.homeManagerModules.stylix ]; home = { diff --git a/home/HomeManager.nix b/home/HomeManager.nix index 3d11cfd..27b7b4f 100644 --- a/home/HomeManager.nix +++ b/home/HomeManager.nix @@ -23,7 +23,6 @@ in { default = {}; type = types.submodule { options = { - android.enable = mkEnableOption "Android apks."; common.enable = mkEnableOption "Common apps."; core.enable = mkEnableOption "Core apps."; creative.enable = mkEnableOption "Creative apps."; @@ -49,7 +48,6 @@ in { programs = import ./program args; dconf.settings = util.catSet (util.ls ./config/dconf) args; } - (mkIf cfg.package.android.enable { home.packages = package.android; }) (mkIf cfg.package.common.enable { home.packages = package.common; }) (mkIf cfg.package.core.enable { home.packages = package.core; }) (mkIf cfg.package.creative.enable { home.packages = package.creative; }) diff --git a/host/home/default.nix b/host/home/default.nix index 0944589..2490aec 100644 --- a/host/home/default.nix +++ b/host/home/default.nix @@ -27,7 +27,6 @@ storage = "/storage/hot/ftp"; }; package = { - android.enable = true; common.enable = true; core.enable = true; desktop.enable = true; diff --git a/module/Package.nix b/module/Package.nix index ed24c70..9d37611 100644 --- a/module/Package.nix +++ b/module/Package.nix @@ -4,7 +4,6 @@ in { options = { module.package = { - android.enable = mkEnableOption "Android Apks."; common.enable = mkEnableOption "Common Apps."; core.enable = mkEnableOption "Core apps."; creative.enable = mkEnableOption "Creative Apps."; @@ -51,11 +50,6 @@ in { services.gvfs.enable = true; }) - # Android apps. - (mkIf cfg.android.enable { - environment.systemPackages = package.android; - }) - # Desktop apps. (mkIf cfg.desktop.enable { environment.systemPackages = package.desktop; diff --git a/package/apks/default.nix b/package/apks/default.nix deleted file mode 100644 index 0319b0c..0000000 --- a/package/apks/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib, stdenv, fetchurl, ... }: let - apks = { - # https://github.com/bitwarden/mobile/releases - Bitwarden = fetchurl { - url = "https://github.com/bitwarden/mobile/releases/download/v2024.5.1/com.x8bit.bitwarden-fdroid.apk"; - sha256 = "sha256-n4c5xEYvgd8Uhkqh3zSSyVA13ia+yqqGWA/DCATgOmU="; - }; - - # https://github.com/bitfireAT/davx5-ose/releases - Davx5 = fetchurl { - url = "https://github.com/bitfireAT/davx5-ose/releases/download/v4.4.0.1-ose/davx5-ose-4.4.0.1-ose-release.apk"; - sha256 = "sha256-CBGWVBrxmxUSQ0Q7OEX8W6ZBfEW9AXQ90QyKfA+cENw="; - }; - - # https://github.com/patzly/grocy-android/releases - Grocy = fetchurl { - url = "https://github.com/patzly/grocy-android/releases/download/v3.5.2/Grocy-Android-v3.5.2.apk"; - sha256 = "sha256-HyKoSl5po1Pl5keknlArruKXQHiSkNYfqKPMeBtvAN4="; - }; - - # https://github.com/jellyfin/jellyfin-android/releases - Jellyfin = fetchurl { - url = "https://github.com/jellyfin/jellyfin-android/releases/download/v2.6.1/jellyfin-android-v2.6.1-libre-release.apk"; - sha256 = "sha256-Jyd/qM2vvtU7uogVla7ldpFqn2yRmq3ZKW/yHKpUafg="; - }; - - # https://github.com/nextcloud/android/releases - NextCloud = fetchurl { - url = "https://github.com/nextcloud/android/releases/download/stable-3.29.0/nextcloud-30290090.apk"; - sha256 = "sha256-ArsGpXX7ClkBdOBJwQrxPVTr7fNNjZjTflvlAd5insw="; - }; - - # https://f-droid.org/packages/com.termux.nix - NixOnDroid = fetchurl { - url = "https://f-droid.org/repo/com.termux.nix_188035.apk"; - sha256 = "sha256-sAuJejlDO5JY8+k1uql8ANug1l324lpxLg4w276pbEw="; - }; - - # https://github.com/ONLYOFFICE/documents-app-android/releases - OnlyOffice = fetchurl { - url = "https://github.com/ONLYOFFICE/documents-app-android/releases/download/v8.0.1-533/onlyoffice-manager-8.0.1-533.apk"; - sha256 = "sha256-M2x5Vgaxcwuzc1QsIwhuIK9w7ANLcT3oOOJniWjCh3E="; - }; - - # https://download.wireguard.com/android-client - Wireguard = fetchurl { - url = "https://download.wireguard.com/android-client/com.wireguard.android-1.0.20231018.apk"; - sha256 = "sha256-2NiCqtIO68j7X1FSc/c6xzTNaXUPRfbs2qt7/PVchP4="; - }; - }; -in stdenv.mkDerivation { - name = "apks"; - dontUnpack = true; - - installPhase = "mkdir $out\n" + builtins.foldl' (acc: apk: acc + "${apk}\n") "" ( - lib.mapAttrsToList (name: path: "cp ${path} $out/${name}.apk") apks - ); -} diff --git a/package/default.nix b/package/default.nix index f1720fe..2ff251f 100644 --- a/package/default.nix +++ b/package/default.nix @@ -105,10 +105,6 @@ jetbrains.idea-community ]; - android = [ - (pkgs.callPackage ./apks {}) - ]; - extra = with pkgs; [ anilibria-winmaclinux # Anime! appimage-run # Tool to run .AppImage files in NixOS.