treewide: remove impure nixpkgs
parent
360782bd4a
commit
3f04056f70
3
conf
3
conf
|
@ -4,8 +4,7 @@ if ! [ -e secrets.nix ]
|
||||||
then
|
then
|
||||||
git crypt unlock
|
git crypt unlock
|
||||||
fi
|
fi
|
||||||
# TODO: remove nixpkgs dependency
|
export NIX_PATH=yori-nix=$PWD
|
||||||
export NIX_PATH=yori-nix=$PWD:nixpkgs=channel:nixos-unstable
|
|
||||||
host=$1
|
host=$1
|
||||||
TARGET_HOST=$(nix eval --raw -f vpn.nix ips.$host)
|
TARGET_HOST=$(nix eval --raw -f vpn.nix ips.$host)
|
||||||
#TARGET_HOST=192.168.178.1
|
#TARGET_HOST=192.168.178.1
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, modulesPath, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
|
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||||
|
|
|
@ -1,11 +1,10 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, modulesPath, ... }:
|
||||||
let
|
let
|
||||||
ipconf = (import ../secrets.nix).ipconf.${config.networking.hostName};
|
ipconf = (import ../secrets.nix).ipconf.${config.networking.hostName};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
# todo: impure:
|
[ (modulesPath + "/profiles/qemu-guest.nix")
|
||||||
[ <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
|
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, modulesPath, ... }:
|
||||||
let sources = import ../nix/sources.nix;
|
let sources = import ../nix/sources.nix;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
||||||
imports =
|
imports =
|
||||||
[ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
|
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||||
./.
|
./.
|
||||||
"${sources.nixos-hardware}/common/cpu/intel"
|
"${sources.nixos-hardware}/common/cpu/intel"
|
||||||
];
|
];
|
||||||
|
|
Loading…
Reference in New Issue