From 8273d987884e9f0d4ab73d60149d15a570352c0c Mon Sep 17 00:00:00 2001 From: h7x4 Date: Tue, 27 Jan 2026 18:35:18 +0900 Subject: [PATCH] flake.nix: add `disko` to default devshell --- flake.nix | 11 ++++++++++- shell.nix | 11 ++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 04ef7a2..9dc2058 100644 --- a/flake.nix +++ b/flake.nix @@ -280,7 +280,16 @@ }; devShells = forAllSystems (system: { - default = nixpkgs-unstable.legacyPackages.${system}.callPackage ./shell.nix { }; + default = let + pkgs = import nixpkgs-unstable { + inherit system; + overlays = [ + (final: prev: { + inherit (inputs.disko.packages.${system}) disko; + }) + ]; + }; + in pkgs.callPackage ./shell.nix { }; cuda = let cuda-pkgs = import nixpkgs-unstable { inherit system; diff --git a/shell.nix b/shell.nix index 506c51e..44c4e38 100644 --- a/shell.nix +++ b/shell.nix @@ -1,15 +1,16 @@ { pkgs ? import {} }: pkgs.mkShellNoCC { packages = with pkgs; [ - just - jq + disko + editorconfig-checker + gnupg gum + jq + just + openstackclient sops ssh-to-age - gnupg statix - openstackclient - editorconfig-checker ]; env = {