diff options
Diffstat (limited to '')
| -rwxr-xr-x | modules/by-name/di/direnv/landrun-fish.sh | 1 | ||||
| -rw-r--r-- | modules/by-name/di/direnv/module.nix | 4 | ||||
| -rw-r--r-- | modules/by-name/di/disks/module.nix | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/modules/by-name/di/direnv/landrun-fish.sh b/modules/by-name/di/direnv/landrun-fish.sh index 9f7f3bdf..2c270050 100755 --- a/modules/by-name/di/direnv/landrun-fish.sh +++ b/modules/by-name/di/direnv/landrun-fish.sh @@ -8,6 +8,7 @@ trap 'rm --recursive "$_new_tmp"' EXIT landrun \ --env XDG_RUNTIME_DIR \ --env NIX_SHELL_LEVEL \ + --env SHELL=fish \ --env TERM \ --env SHLVL \ --env IN_DIRENV_SANDBOX=true \ diff --git a/modules/by-name/di/direnv/module.nix b/modules/by-name/di/direnv/module.nix index 97e56827..e868ebba 100644 --- a/modules/by-name/di/direnv/module.nix +++ b/modules/by-name/di/direnv/module.nix @@ -17,14 +17,14 @@ cfg = config.soispha.programs.direnv; direnvCfg = config.home-manager.users.soispha.programs.direnv; - inherit (sources) devshells nixpkgs; + inherit (sources) devshells nixpkgs-unstable; pre-cache = pkgs.runCommand "pre-cache.sh" {} '' cat "${./pre-cache.sh}" > $out substituteInPlace $out \ --replace-fail "%DEVSHELLS_REPO%" "${devshells}" \ - --replace-fail "%DEVSHELLS_REPO_REF%" "${devshells.sourceInfo.rev}.${builtins.readFile "${nixpkgs}/.git-revision"}" + --replace-fail "%DEVSHELLS_REPO_REF%" "${devshells.sourceInfo.rev}.${builtins.readFile "${nixpkgs-unstable}/.git-revision"}" ''; landrun-fish = pkgs.writeShellApplication { diff --git a/modules/by-name/di/disks/module.nix b/modules/by-name/di/disks/module.nix index ed5c939a..0a46c402 100644 --- a/modules/by-name/di/disks/module.nix +++ b/modules/by-name/di/disks/module.nix @@ -11,7 +11,7 @@ config, lib, pkgs, - modules, + extra_modules, ... }: let cfg = config.soispha.disks; @@ -42,7 +42,7 @@ in { }; imports = [ - modules.disko.nixosModules.default + extra_modules.nixos.disko ]; config = lib.mkIf cfg.enable { |