From 75444803cd0eecdcc8437114ef18592a81755a06 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Sun, 22 Dec 2024 04:35:19 -0500
Subject: [PATCH] fix(droid): fix eval of pkgs and nvim module

---
 configurations/android/nix-on-droid.nix | 7 ++++++-
 lib/flake/default.nix                   | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/configurations/android/nix-on-droid.nix b/configurations/android/nix-on-droid.nix
index 8f306dfd..a786d29c 100644
--- a/configurations/android/nix-on-droid.nix
+++ b/configurations/android/nix-on-droid.nix
@@ -39,7 +39,12 @@
   home-manager.config = {
     imports = [
       self.homeManagerModules.neovim
-      {programs.neovim.enable = true;}
+      {
+        programs.neovim = {
+          enable = true;
+          user = "nix-on-droid";
+        };
+      }
 
       self.homeManagerModules.shell
       {programs.bash.enable = true;}
diff --git a/lib/flake/default.nix b/lib/flake/default.nix
index 6e074ada..e9f581f8 100644
--- a/lib/flake/default.nix
+++ b/lib/flake/default.nix
@@ -29,7 +29,11 @@ inputs: rec {
             ]
             ++ (cfg.config.permittedInsecurePackages or []);
         }
-        // (cfg.config or {});
+        // (builtins.removeAttrs (
+          if cfg.config or null == null
+          then {}
+          else cfg.config
+        ) ["permittedInsecurePackages"]);
     };
 
   # Enable use of `nixpkgs.overlays` on both NixOS and NixOnDroid