From 7f0daacd086c1c3bdfff25539fdba24481309d14 Mon Sep 17 00:00:00 2001 From: Emmet Date: Sat, 9 Mar 2024 11:28:18 -0600 Subject: [PATCH] Reverting *some autoinstall script changes --- README.org | 2 +- flake.nix | 2 +- install.org | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.org b/README.org index 974f3ec5..aa4aa493 100644 --- a/README.org +++ b/README.org @@ -23,7 +23,7 @@ I wrote some reinstall notes for myself [[./install.org][here (install.org)]]. TLDR: You should™ be able to install my dotfiles to a fresh NixOS system with the following experimental script: #+begin_src sh :noeval -nix-shell -p git nixFlakes --command "nix run gitlab:librephoenix/nixos-config" +nix-shell -p git --command "nix run --experimental-features 'nix-command flakes' gitlab:librephoenix/nixos-config" #+end_src Disclaimer: Ultimately, I can't gaurantee this will work for anyone other than myself, so /use this at your own discretion/. Also my dotfiles are /highly/ opinionated, which you will discover immediately if you try them out. diff --git a/flake.nix b/flake.nix index cd1e5f5d..4e180a0f 100644 --- a/flake.nix +++ b/flake.nix @@ -149,7 +149,7 @@ install = pkgs.writeShellApplication { name = "install"; - runtimeInputs = with pkgs; [ git gnused ]; + runtimeInputs = with pkgs; [ git ]; # I could make this fancier by adding other deps text = ''${./install.sh} "$@"''; }; }); diff --git a/install.org b/install.org index 39a40fd5..ffc09b92 100644 --- a/install.org +++ b/install.org @@ -23,18 +23,18 @@ nix run git+https://codeberg.org/librephoenix/nixos-config The script will ask for sudo permissions at certain points, /but you should not run the script as root/. -If the above =nix run= command gives you an error, odds are you either don't have =git= installed, or you haven't enabled the experimental features in your Nix config (=nix-command= and =flakes=). To get the command to install properly, you can first enter a shell with =git= and =nixFlakes= available using: +If the above =nix run= command gives you an error, odds are you either don't have =git= installed, or you haven't enabled the experimental features in your Nix config (=nix-command= and =flakes=). To get the command to install properly, you can first enter a shell with =git= available using: #+begin_src sh :noeval -nix-shell -p git nixFlakes +nix-shell -p git #+end_src and then running: #+BEGIN_SRC sh :noeval -nix run gitlab:librephoenix/nixos-config +nix run --experimental-features 'nix-command flakes' gitlab:librephoenix/nixos-config #+END_SRC And if you want a single copy-paste solution: #+begin_src sh :noeval -nix-shell -p git nixFlakes --command "nix run gitlab:librephoenix/nixos-config" +nix-shell -p git --command "nix run --experimental-features 'nix-command flakes' gitlab:librephoenix/nixos-config" #+end_src At a certain point in the install script it will open =nano= (or whatever your $EDITOR is set to) and ask you to edit the =flake.nix=. You can edit as much or as little of the config variables as you like, and it will continue the install after you exit the editor.