diff --git a/default.nix b/default.nix index 168763a..8664902 100644 --- a/default.nix +++ b/default.nix @@ -43,7 +43,8 @@ rec { echo "Installing nix-on-droid.nix default config file..." ${pkgs.coreutils}/bin/mkdir --parents $HOME/.config/nixpkgs - ${pkgs.coreutils}/bin/cp ${./modules/build/initial-build/nix-on-droid.nix.default} $HOME/.config/nixpkgs/nix-on-droid.nix + ${pkgs.coreutils}/bin/cp ${./modules/environment/login/nix-on-droid.nix.default} $HOME/.config/nixpkgs/nix-on-droid.nix + ${pkgs.coreutils}/bin/chmod u+w $HOME/.config/nixpkgs/nix-on-droid.nix if command -v home-manager && [[ -n "$HOME_MANAGER_CONFIG" && -r "$HOME_MANAGER_CONFIG" || -r "$HOME/.config/nixpkgs/home.nix" ]]; then echo "Migrating home-manager installation..." diff --git a/modules/build/initial-build/default.nix b/modules/build/initial-build.nix similarity index 91% rename from modules/build/initial-build/default.nix rename to modules/build/initial-build.nix index 95d6239..f88b5e9 100644 --- a/modules/build/initial-build/default.nix +++ b/modules/build/initial-build.nix @@ -38,7 +38,6 @@ with lib; # uid and gid need to be determined. environment.etc = { "group".enable = false; - "nix-on-droid.nix.default".text = builtins.readFile ./nix-on-droid.nix.default; "passwd".enable = false; }; diff --git a/modules/environment/login/login-inner.nix b/modules/environment/login/login-inner.nix index d1e74f4..82996af 100644 --- a/modules/environment/login/login-inner.nix +++ b/modules/environment/login/login-inner.nix @@ -39,7 +39,8 @@ writeText "login-inner" '' echo "Copy default nix-on-droid config..." ${coreutils}/bin/mkdir --parents $HOME/.config/nixpkgs - ${coreutils}/bin/cp /etc/nix-on-droid.nix.default $HOME/.config/nixpkgs/nix-on-droid.nix + ${coreutils}/bin/cp ${./nix-on-droid.nix.default} $HOME/.config/nixpkgs/nix-on-droid.nix + ${coreutils}/bin/chmod u+w $HOME/.config/nixpkgs/nix-on-droid.nix echo "Installing first nix-on-droid generation..." ${nix}/bin/nix build --no-link --file "" nix-on-droid diff --git a/modules/build/initial-build/nix-on-droid.nix.default b/modules/environment/login/nix-on-droid.nix.default similarity index 100% rename from modules/build/initial-build/nix-on-droid.nix.default rename to modules/environment/login/nix-on-droid.nix.default diff --git a/pkgs/default.nix b/pkgs/default.nix index 4d04697..ff4f301 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -13,7 +13,7 @@ let initialBuild = true; config = { - imports = [ ../modules/build/initial-build ]; + imports = [ ../modules/build/initial-build.nix ]; _module.args = { inherit customPkgs; };