From 240a2585fa819ee931807ca08355af9196897c99 Mon Sep 17 00:00:00 2001
From: Aleksandr Lebedev <alex.lebedev2003@icloud.com>
Date: Sat, 18 Jan 2025 14:41:44 +0000
Subject: [PATCH] Fixes for emacs on android

---
 nixos/homes/kylekrein/default.nix | 13 +++----------
 nixos/homes/kylekrein/git.nix     | 14 ++++++++++++++
 nixos/hosts/android/home.nix      | 13 +++++++++++--
 nixos/modules/emacs/packages.nix  |  4 ++++
 4 files changed, 32 insertions(+), 12 deletions(-)
 create mode 100644 nixos/homes/kylekrein/git.nix

diff --git a/nixos/homes/kylekrein/default.nix b/nixos/homes/kylekrein/default.nix
index 372a103..71ae827 100644
--- a/nixos/homes/kylekrein/default.nix
+++ b/nixos/homes/kylekrein/default.nix
@@ -1,12 +1,5 @@
 {username, ...}: {
-  programs.git = {
-    enable = true;
-    userName = "Aleksandr Lebedev";
-    userEmail = "alex.lebedev2003@icloud.com";
-    extraConfig = {
-      credential.helper = "manager"; #"${pkgs.git.override { withLibsecret = true; }}/bin/git-credential-libsecret";
-      credential."https://github.com".username = "KyleKrein";
-      credential.credentialStore = "plaintext";
-    };
-  };
+  imports = [
+    ./git.nix
+  ];
 }
diff --git a/nixos/homes/kylekrein/git.nix b/nixos/homes/kylekrein/git.nix
new file mode 100644
index 0000000..882ae50
--- /dev/null
+++ b/nixos/homes/kylekrein/git.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+{
+  programs.git = {
+        enable = true;
+            userName = "Aleksandr Lebedev";
+                userEmail = "alex.lebedev2003@icloud.com";
+                extraConfig = {
+                  credential.helper = "manager"; #"${pkgs.git.override { withLibsecret = true;  }}/bin/git-credential-libsecret";
+                  #      credential."https://github.com".username = "KyleKrein";
+                  #            credential.credentialStore = "plaintext";
+                  #
+                };
+  };
+}
diff --git a/nixos/hosts/android/home.nix b/nixos/hosts/android/home.nix
index ff4f7c7..7107ff3 100644
--- a/nixos/hosts/android/home.nix
+++ b/nixos/hosts/android/home.nix
@@ -1,8 +1,17 @@
-{ pkgs, ... }:
+{ pkgs, config, lib,  ... }:
 {
     imports = [
-	#../../modules/nixvim
+#../../modules/nixvim
+      ../../homes/kylekrein/git.nix
     ];
+    home.activation = {
+        copyFont = let
+          font_src = "${pkgs.nerd-fonts.fira-code}/share/fonts/truetype/NerdFonts/FiraCode/FiraCodeNerdFont-Regular.ttf";
+          font_dst = "${config.home.homeDirectory}/.termux/font.ttf";
+        in lib.hm.dag.entryAfter ["writeBoundary"] ''
+      ( test ! -e "${font_dst}" || test $(sha1sum "${font_src}"|cut -d' ' -f1 ) != $(sha1sum "${font_dst}" |cut -d' ' -f1)) && $DRY_RUN_CMD install $VERBOSE_ARG -D "${font_src}" "${font_dst}"
+  '';
+    };
 
     home.stateVersion = "24.05";
 }
diff --git a/nixos/modules/emacs/packages.nix b/nixos/modules/emacs/packages.nix
index 95570c2..1b41925 100644
--- a/nixos/modules/emacs/packages.nix
+++ b/nixos/modules/emacs/packages.nix
@@ -4,6 +4,10 @@
 }: {
   packages = with pkgs; [
     git
+    gzip
+    zip
+    unzip
+    gnutar
     libvterm
     libtool
     emacs