diff --git a/nix-conf/system/flake.nix b/nix-conf/system/flake.nix index e2e7c10..d10d464 100644 --- a/nix-conf/system/flake.nix +++ b/nix-conf/system/flake.nix @@ -16,16 +16,16 @@ agenix.nixosModule { age.secrets.s3fs = { - file = ./secrets/s3fs.age; + file = ../../secrets/s3fs.age; # mode = "600"; # owner + group only # owner = "hungtr"; # group = "users"; }; age.secrets."s3fs.digital-garden" = { - file = ./secrets/s3fs.digital-garden.age; + file = ../../secrets/s3fs.digital-garden.age; }; age.secrets._nhitrl_cred = { - file = ./secrets/_nhitrl.age; + file = ../../secrets/_nhitrl.age; }; environment.systemPackages = [ agenix.defaultPackage.x86_64-linux ]; } diff --git a/templates/py-poetry/flake.nix b/templates/py-poetry/flake.nix index 4e454b9..d8a8e70 100644 --- a/templates/py-poetry/flake.nix +++ b/templates/py-poetry/flake.nix @@ -13,10 +13,15 @@ }); devShells = forAllSystems (system: { + bootstrap = pkgs.${system}.mkShellNoCC { + packages = [ + pkgs.${system}.poetry + ]; + }; default = pkgs.${system}.mkShellNoCC { - packages = with pkgs.${system}; [ - (poetry2nix.mkPoetryEnv { projectDir = self; }) - poetry + packages = [ + (pkgs.${system}.poetry2nix.mkPoetryEnv { projectDir = self; }) + pkgs.${system}.poetry ]; }; });