diff --git a/src/pkgs/bootstrap.nix b/src/pkgs/bootstrap.nix index cddc777..30d21a0 100644 --- a/src/pkgs/bootstrap.nix +++ b/src/pkgs/bootstrap.nix @@ -21,7 +21,6 @@ buildPkgs.runCommand "bootstrap" { } '' cp ${files.login} $out/bin/login cp ${files.loginInner} $out/bin/.login-inner - cp ${files.nixOnDroidInstall} $out/bin/nix-on-droid-install cp ${files.homeNixDefault} $out/etc/home.nix.default cp ${files.nixConf} $out/etc/nix/nix.conf diff --git a/src/pkgs/files/default.nix b/src/pkgs/files/default.nix index b09c06f..904fa33 100644 --- a/src/pkgs/files/default.nix +++ b/src/pkgs/files/default.nix @@ -28,8 +28,6 @@ in trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-on-droid.cachix.org-1:56snoMJTXmDRC1Ei24CmKoUqvHJ9XCp+nidK7qkMQrU= ''; - nixOnDroidInstall = callPackage ./nix-on-droid-install.nix { }; - resolvConf = writeText "resolv.conf" '' nameserver 1.1.1.1 nameserver 8.8.8.8 diff --git a/src/pkgs/files/nix-on-droid-install.nix b/src/pkgs/files/nix-on-droid-install.nix deleted file mode 100644 index 075a85a..0000000 --- a/src/pkgs/files/nix-on-droid-install.nix +++ /dev/null @@ -1,38 +0,0 @@ -# Licensed under GNU Lesser General Public License v3 or later, see COPYING. -# Copyright (c) 2019 Alexander Sosedkin and other contributors, see AUTHORS. - -{ instDir, packageInfo, writeScript }: - -writeScript "nix-on-droid-install" '' - #!/bin/sh - set -e - - if [ -e $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh ]; then - echo "You already have home-manager installed." - fi - - echo "Installing home-manager and other good stuff..." - - echo "Subscribing to the stable (nixos-19.03) channel of nixpkgs..." - echo "If you want unstable instead, you probably also know what to do." - ${packageInfo.nix}/bin/nix-channel --add https://nixos.org/channels/nixos-19.03 nixpkgs - echo "Subscribing to home-manager channel..." - ${packageInfo.nix}/bin/nix-channel --add https://github.com/rycee/home-manager/archive/master.tar.gz home-manager - echo "Updating channels..." - ${packageInfo.nix}/bin/nix-channel --update - echo "Whew." - - export NIX_PATH=$HOME/.nix-defexpr/channels''${NIX_PATH:+:}$NIX_PATH - - if [ ! -e $HOME/.config/nixpkgs/home.nix ]; then - echo "Creating an initial home-manager configuration in ~/.config/nixpkgs/home.nix ..." - ${packageInfo.nix}/bin/nix run nixpkgs.coreutils -c mkdir -p $HOME/.config/nixpkgs/ - ${packageInfo.nix}/bin/nix run nixpkgs.coreutils -c cp -n ${instDir}/etc/home.nix.default $HOME/.config/nixpkgs/home.nix - fi - - echo "Installing home-manager..." - ${packageInfo.nix}/bin/nix run nixpkgs.nix -c ${packageInfo.nix}/bin/nix-shell '' -A install - - echo "Edit ~/.config/nixpkgs/home.nix and home-manager rebuild to control what is going on." - echo "Run bash or restart your session to enjoy a much nicer environment." -''