fix paths

auto-flake-update
Yorick van Pelt 2017-02-02 18:58:13 +01:00
parent c57cefa71b
commit 5cb4dc11c0
2 changed files with 3 additions and 3 deletions

4
conf
View File

@ -8,11 +8,11 @@ fi
export NIX_PATH="ssh-id-file=`pwd`/deploy_key":secrets=`pwd`/secrets.nix
case $1 in
stable)
export NIX_PATH="nixpkgs=https://nixos.org/channels/nixos-16.09/nixexprs.tar.xz:nixos-config=`pwd`/$2/configuration.nix:$NIX_PATH"
export NIX_PATH="nixpkgs=https://nixos.org/channels/nixos-16.09/nixexprs.tar.xz:nixos-config=`pwd`/logical/$2.nix:$NIX_PATH"
eval ${@:3}
;;
channel)
export NIX_PATH="/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=`pwd`/$2/configuration.nix:$NIX_PATH"
export NIX_PATH="/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=`pwd`/logical/$2.nix:$NIX_PATH"
eval ${@:3}
;;
update-encrypt)

View File

@ -5,7 +5,7 @@
{
imports =
[ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
./linux-nvme.nix
../modules/linux-nvme.nix
];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];