feat(nix-droid): using utility mkDroidConfiguration

r17x · Nov 3, 2024 · 280e4f0 · 280e4f0
1 parent d9c9e76
commit 280e4f0
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 29 deletions.
diff --git a/nix/default.nix b/nix/default.nix
@@ -93,8 +93,6 @@
               inputs'
               system
               branches
-              nix
-              nixpkgs
               ;
             inputs = lib.mkForce inputs;
           };

diff --git a/nix/hosts/default.nix b/nix/hosts/default.nix
@@ -86,6 +86,32 @@ let
     );
 
   mkDarwinConfigurations = configurations: builtins.mapAttrs mkDarwin configurations;
+
+  mkDroidConfiguration =
+    {
+      system,
+      modules ? [ ],
+    }:
+    withSystem system (
+      ctx:
+      inputs.nix-on-droid.lib.nixOnDroidConfiguration {
+        inherit (ctx) pkgs;
+        modules = [
+          {
+            nix = {
+              inherit (ctx.nix)
+                nixPath
+                registry
+                package
+                ;
+              extraOptions = ''
+                experimental-features = nix-command flakes pipe-operators
+              '';
+            };
+          }
+        ] ++ modules;
+      }
+    );
 in
 
 {
@@ -109,32 +135,22 @@ in
     eR17x = { };
   };
 
-  flake.nixOnDroidConfigurations.default =
-    let
-      stateVersion = "24.05";
-    in
-    inputs.nix-on-droid.lib.nixOnDroidConfiguration {
-      pkgs = import inputs.nixpkgs {
-        system = "aarch64-linux";
-        overlays = inputs.nixpkgs.lib.attrValues self.overlays;
-      };
-      modules = [
-        {
-          system.stateVersion = stateVersion;
-          nix.extraOptions = ''
-            experimental-features = nix-command flakes
-          '';
-          home-manager.useGlobalPkgs = true;
-          home-manager.config = {
-            home.stateVersion = stateVersion;
-            imports = [
-              self.homeManagerModules.r17-shell
-              self.homeManagerModules.r17-packages
-            ];
-          };
-        }
-      ];
-    }
+  flake.nixOnDroidConfigurations.default = mkDroidConfiguration rec {
+    system = "aarch64-linux";
+    modules = [
+      {
+        system.stateVersion = "24.05";
+        home-manager.backupFileExtension = "backup-before-nix";
+        home-manager.useGlobalPkgs = true;
+        home-manager.config = {
+          home.stateVersion = "24.05";
+          home.packages = [ self.packages.${system}.nvim ];
+          imports = [
+            self.homeManagerModules.r17-shell
+          ];
+        };
+      }
+    ];
+  };
 
-  ;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -93,8 +93,6 @@ @@
                   inputs'
                   system
                   branches
-                  nix
-                  nixpkgs
                   ;
                 inputs = lib.mkForce inputs;
               };
@@ Expand Down @@