From 31b749cd83d77e9be88afb005ba5be95e06d73bb Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Fri, 16 Apr 2021 12:54:31 -0400 Subject: [PATCH] shrink sc-scripts --- modules/flakes.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/modules/flakes.nix b/modules/flakes.nix index e8c3388..2009d55 100644 --- a/modules/flakes.nix +++ b/modules/flakes.nix @@ -1,7 +1,6 @@ { config, pkgs, lib, ... }: let cfg = config.sconfig.flakes; - upgradeArg = if cfg.rebuildPath == "/etc/nixos" then "--refresh --recreate-lock-file" else "--refresh"; in { options.sconfig.flakes = { @@ -21,18 +20,8 @@ in ''; environment.systemPackages = map - (x: (pkgs.writeShellScriptBin - "sc-${builtins.head x}" - "nixos-rebuild ${lib.concatStringsSep " " (builtins.tail x)} --flake ${cfg.rebuildPath}" - )) - [ - [ "switch" "switch" ] - [ "build" "build" ] - [ "boot" "boot" ] - [ "switch-upgrade" "switch" upgradeArg ] - [ "build-upgrade" "build" upgradeArg ] - [ "boot-upgrade" "boot" upgradeArg ] - ]; + (x: (pkgs.writeShellScriptBin "sc-${x}" "nixos-rebuild ${x} --refresh --flake ${cfg.rebuildPath}")) + [ "switch" "build" "boot" ]; }; }