From 632104be6905b5cf363b67c80415063d739d4a35 Mon Sep 17 00:00:00 2001 From: Hung Date: Tue, 16 May 2023 09:31:51 -0700 Subject: [PATCH] fix(flakes): minimum to work correctly, along with user shell integration --- flake.nix | 13 +++++++------ nix/cells/dotfiles/devshells.nix | 2 +- nix/cells/repo/userShells.nix | 4 ++++ 3 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 nix/cells/repo/userShells.nix diff --git a/flake.nix b/flake.nix index 34b36b1..10f81b4 100644 --- a/flake.nix +++ b/flake.nix @@ -23,18 +23,19 @@ cellBlocks = let - inherit (std.blockTypes) devShells functions; + inherit (std.blockTypes) devshells functions; in [ - (devShells "devshells") - (functions "host_profile") - (functions "home_profile") + (devshells "devshells") + (devshells "userShells") + # (functions "host_profile") + # (functions "home_profile") ]; } { devShells = std.harvest [ [ "dotfiles" "devshells" ] ]; - nixosConfigurations = std.pick [ [ "dotfiles" "nixos" ] ]; - homeConfigurations = std.pick [ [ "dotfiles" "home" ] ]; + # nixosConfigurations = std.pick [ [ "dotfiles" "nixos" ] ]; + # homeConfigurations = std.pick [ [ "dotfiles" "home" ] ]; }; } diff --git a/nix/cells/dotfiles/devshells.nix b/nix/cells/dotfiles/devshells.nix index 44bc82b..fe24e92 100644 --- a/nix/cells/dotfiles/devshells.nix +++ b/nix/cells/dotfiles/devshells.nix @@ -1,4 +1,4 @@ -{inputs, cells}: let +{inputs, cell}: let inherit (inputs) std nixpkgs; in { diff --git a/nix/cells/repo/userShells.nix b/nix/cells/repo/userShells.nix new file mode 100644 index 0000000..3d5b345 --- /dev/null +++ b/nix/cells/repo/userShells.nix @@ -0,0 +1,4 @@ +{inputs, cell}: { + htran = inputs.cells.dotfiles.devshells.default; + hungtran = inputs.cells.dotfiles.devshells.default; +}