flake.lock, *: update more inputs, reformat a bit

nix-community · Mar 3, 2024 · a19d0bc · a19d0bc
1 parent f3e5246
commit a19d0bc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 33 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/modules/environment/networking.nix b/modules/environment/networking.nix
@@ -19,9 +19,9 @@ in
 
   ###### interface
 
-  options = {
+  options.networking = {
 
-    networking.hosts = lib.mkOption {
+    hosts = lib.mkOption {
       type = types.attrsOf (types.listOf types.str);
       default = { };
       example = literalExpression ''
@@ -35,7 +35,7 @@ in
       '';
     };
 
-    networking.hostFiles = lib.mkOption {
+    hostFiles = lib.mkOption {
       type = types.listOf types.path;
       defaultText = literalMD "Hosts from {option}`networking.hosts` and {option}`networking.extraHosts`";
       example = literalExpression ''[ "''${pkgs.my-blocklist-package}/share/my-blocklist/hosts" ]'';
@@ -44,7 +44,7 @@ in
       '';
     };
 
-    networking.extraHosts = lib.mkOption {
+    extraHosts = lib.mkOption {
       type = types.lines;
       default = "";
       example = "192.168.0.1 lanlocalhost";

diff --git a/tests/on-device/config-flake-h-m.flake.nix b/tests/on-device/config-flake-h-m.flake.nix
@@ -4,9 +4,11 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
     home-manager.url = "github:nix-community/home-manager/release-23.11";
-    nix-on-droid.url = "<<FLAKE_URL>>";
-    nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
-    nix-on-droid.inputs.home-manager.follows = "home-manager";
+    nix-on-droid = {
+      url = "<<FLAKE_URL>>";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.home-manager.follows = "home-manager";
+    };
   };
 
   outputs = { nix-on-droid, ... }: {