diff --git a/flake.lock b/flake.lock index c6fe9a97..86a41b78 100644 --- a/flake.lock +++ b/flake.lock @@ -4,15 +4,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": "utils" + ] }, "locked": { - "lastModified": 1663932797, - "narHash": "sha256-IH8ZBW99W2k7wKLS+Sat9HiKX1TPZjFTnsPizK5crok=", + "lastModified": 1709445365, + "narHash": "sha256-DVv6nd9FQBbMWbOmhq0KVqmlc3y3FMSYl49UXmMcO+0=", "owner": "nix-community", "repo": "home-manager", - "rev": "de3758e31a3a1bc79d569f5deb5dac39791bf9b6", + "rev": "4de84265d7ec7634a69ba75028696d74de9a44a7", "type": "github" }, "original": { @@ -30,11 +29,11 @@ "nmt": "nmt" }, "locked": { - "lastModified": 1666720474, - "narHash": "sha256-iWojjDS1D19zpeZXbBdjWb9MiKmVVFQCqtJmtTXgPx8=", + "lastModified": 1705252799, + "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=", "owner": "Gerschtli", "repo": "nix-formatter-pack", - "rev": "14876cc8fe94a3d329964ecb073b4c988c7b61f5", + "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5", "type": "github" }, "original": { @@ -139,11 +138,11 @@ "scss-reset": { "flake": false, "locked": { - "lastModified": 1683906868, - "narHash": "sha256-cif5Sx8Ca5vxdw/mNAgpulLH15TwmzyJFNM7JURpoaE=", + "lastModified": 1631450058, + "narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=", "owner": "andreymatin", "repo": "scss-reset", - "rev": "5a7bd491ac82441e6283fb0d5d54644b913b30c7", + "rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91", "type": "github" }, "original": { @@ -151,21 +150,6 @@ "repo": "scss-reset", "type": "github" } - }, - "utils": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/modules/environment/networking.nix b/modules/environment/networking.nix index 1c16b0f3..dea87fae 100644 --- 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 index c8cbce40..8a2f3e20 100644 --- 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 = "<>"; - nix-on-droid.inputs.nixpkgs.follows = "nixpkgs"; - nix-on-droid.inputs.home-manager.follows = "home-manager"; + nix-on-droid = { + url = "<>"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home-manager"; + }; }; outputs = { nix-on-droid, ... }: {