Merge #39

39: generate registry and add fup-repl to env r=blaggacao a=Pacman99 fixes #17 The command is just `repl`, I don't know if it needs to be `flk repl` since its a really generic command. Co-authored-by: Pacman99 <[email protected]>
divnix · Jun 1, 2021 · 2a09fd2 · 2a09fd2
2 parents 5862c77 + cf803e8
commit 2a09fd2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/modules.nix b/src/modules.nix
@@ -32,10 +32,9 @@
         "home-manager=${self.inputs.home}"
       ];
 
-      nix.registry = {
-        devos.flake = self;
-        nixos.flake = channel.input;
-      };
+      # package and option is from fup
+      environment.systemPackages = [ pkgs.fup-repl ];
+      nix.generateRegistryFromInputs = lib.mkDefault true;
 
       nix.extraOptions = ''
         experimental-features = ${lib.concatStringsSep " "

diff --git a/src/pkgs-lib/shell/default.nix b/src/pkgs-lib/shell/default.nix
@@ -36,6 +36,7 @@ let
       nixos-generate-config
       nixos-enter
       pkgs'.nixos-rebuild
+      pkgs'.fup-repl
     ];
 
     git.hooks = {

diff --git a/src/pkgs-lib/shell/flk.sh b/src/pkgs-lib/shell/flk.sh
@@ -22,7 +22,8 @@ usage () {
   "iso HOST" "Generate an ISO image of HOST" \
   "install HOST [ARGS]" "Shortcut for nixos-install" \
   "home HOST USER [switch]" "Home-manager config of USER from HOST" \
-  "HOST (switch|boot|test)" "Shortcut for nixos-rebuild"
+  "HOST (switch|boot|test)" "Shortcut for nixos-rebuild" \
+  "repl FLAKE" "Enter a repl with the flake's outputs"
 }
 
 case "$1" in
@@ -93,6 +94,10 @@ case "$1" in
     fi
     ;;
 
+  "repl")
+    repl ${@:2}
+    ;;
+
   *)
     sudo nixos-rebuild --flake "$DEVSHELL_ROOT#$1" "${@:2}"
     ;;