From fc8676c3bb03f4745b61e768c78b14a710b310a9 Mon Sep 17 00:00:00 2001 From: Jack O'Sullivan Date: Sat, 30 Nov 2024 19:19:23 +0000 Subject: [PATCH] devshell: Remove deprecated Nix command stuff --- devshell/commands.nix | 16 ++-------------- devshell/default.nix | 2 +- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/devshell/commands.nix b/devshell/commands.nix index f7a0b72..3033f0e 100644 --- a/devshell/commands.nix +++ b/devshell/commands.nix @@ -115,29 +115,17 @@ in help = "Build home-manager configuration"; command = ''nix build "''${@:2}" ".#homeConfigurations.\"$1\".activationPackage"''; } - { - name = "update-inputs"; - category = "tasks"; - help = "Update flake inputs"; - command = '' - args=() - for f in "$@"; do - args+=(--update-input "$f") - done - nix flake lock "''${args[@]}" - ''; - } { name = "update-nixpkgs"; category = "tasks"; help = "Update nixpkgs flake inputs"; - command = ''update-inputs nixpkgs-{unstable,stable,mine,mine-stable}''; + command = ''nix flake update nixpkgs-{unstable,stable,mine,mine-stable}''; } { name = "update-home-manager"; category = "tasks"; help = "Update home-manager flake inputs"; - command = ''update-inputs home-manager-{unstable,stable}''; + command = ''nix flake update home-manager-{unstable,stable}''; } { name = "update-installer"; diff --git a/devshell/default.nix b/devshell/default.nix index f184d53..6a92814 100644 --- a/devshell/default.nix +++ b/devshell/default.nix @@ -11,7 +11,7 @@ in NIX_USER_CONF_FILES = toString (pkgs.writeText "nix.conf" '' - experimental-features = nix-command flakes ca-derivations repl-flake + experimental-features = nix-command flakes ca-derivations connect-timeout = 5 fallback = true ${lib.my.c.nix.cache.conf}