Add a role for mounting the nix store over 9pfs.
This is useful for virtual machines since we can have a persistent /nix/store on the host machine.
This commit is contained in:
@@ -14,7 +14,14 @@
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"nvme"
|
||||
"usbhid"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
"sdhci_pci"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ ];
|
||||
boot.extraModulePackages = [ ];
|
||||
@@ -23,7 +30,7 @@
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
{
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
./disk-config.nix
|
||||
./wrapped-disk-config.nix
|
||||
./optimized_build.nix
|
||||
./distributed_build.nix
|
||||
./power_management.nix
|
||||
|
||||
@@ -1,14 +1,8 @@
|
||||
# Manual Step:
|
||||
# Check if drive supports 4kn: nvme id-ns -H /dev/nvme0n1
|
||||
# Format the drive to 4kn: nvme format --lbaf=1 /dev/nvme0n1
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
lib.mkIf (!config.me.buildingIso) {
|
||||
{
|
||||
disko.devices = {
|
||||
disk = {
|
||||
main = {
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
|
||||
@@ -56,31 +56,35 @@
|
||||
(final: prev: {
|
||||
haskellPackages = prev.haskellPackages.extend (
|
||||
final': prev': {
|
||||
crypton = pkgs-unoptimized.haskellPackages.crypton;
|
||||
crypton-connection = pkgs-unoptimized.haskellPackages.crypton-connection;
|
||||
crypton-x509 = pkgs-unoptimized.haskellPackages.crypton-x509;
|
||||
crypton-x509-store = pkgs-unoptimized.haskellPackages.crypton-x509-store;
|
||||
crypton-x509-system = pkgs-unoptimized.haskellPackages.crypton-x509-system;
|
||||
crypton-x509-validation = pkgs-unoptimized.haskellPackages.crypton-x509-validation;
|
||||
hspec-wai = pkgs-unoptimized.haskellPackages.hspec-wai;
|
||||
http-client-tls = pkgs-unoptimized.haskellPackages.http-client-tls;
|
||||
http2 = pkgs-unoptimized.haskellPackages.http2;
|
||||
pandoc = pkgs-unoptimized.haskellPackages.pandoc;
|
||||
pandoc-cli = pkgs-unoptimized.haskellPackages.pandoc-cli;
|
||||
pandoc-lua-engine = pkgs-unoptimized.haskellPackages.pandoc-lua-engine;
|
||||
pandoc-server = pkgs-unoptimized.haskellPackages.pandoc-server;
|
||||
servant-server = pkgs-unoptimized.haskellPackages.servant-server;
|
||||
tls = pkgs-unoptimized.haskellPackages.tls;
|
||||
wai-app-static = pkgs-unoptimized.haskellPackages.wai-app-static;
|
||||
wai-extra = pkgs-unoptimized.haskellPackages.wai-extra;
|
||||
warp = pkgs-unoptimized.haskellPackages.warp;
|
||||
inherit (pkgs-unoptimized.haskellPackages)
|
||||
crypton
|
||||
crypton-connection
|
||||
crypton-x509
|
||||
crypton-x509-store
|
||||
crypton-x509-system
|
||||
crypton-x509-validation
|
||||
hspec-wai
|
||||
http-client-tls
|
||||
http2
|
||||
pandoc
|
||||
pandoc-cli
|
||||
pandoc-lua-engine
|
||||
pandoc-server
|
||||
servant-server
|
||||
tls
|
||||
wai-app-static
|
||||
wai-extra
|
||||
warp
|
||||
;
|
||||
}
|
||||
);
|
||||
})
|
||||
(final: prev: {
|
||||
gsl = pkgs-unoptimized.gsl;
|
||||
redis = pkgs-unoptimized.redis;
|
||||
valkey = pkgs-unoptimized.valkey;
|
||||
inherit (pkgs-unoptimized)
|
||||
gsl
|
||||
redis
|
||||
valkey
|
||||
;
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
8
nix/configuration/hosts/odo/wrapped-disk-config.nix
Normal file
8
nix/configuration/hosts/odo/wrapped-disk-config.nix
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
lib.mkIf (!config.me.buildingIso) (import ./disk-config.nix)
|
||||
@@ -27,7 +27,7 @@
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
|
||||
@@ -50,31 +50,35 @@
|
||||
(final: prev: {
|
||||
haskellPackages = prev.haskellPackages.extend (
|
||||
final': prev': {
|
||||
crypton = pkgs-unoptimized.haskellPackages.crypton;
|
||||
crypton-connection = pkgs-unoptimized.haskellPackages.crypton-connection;
|
||||
crypton-x509 = pkgs-unoptimized.haskellPackages.crypton-x509;
|
||||
crypton-x509-store = pkgs-unoptimized.haskellPackages.crypton-x509-store;
|
||||
crypton-x509-system = pkgs-unoptimized.haskellPackages.crypton-x509-system;
|
||||
crypton-x509-validation = pkgs-unoptimized.haskellPackages.crypton-x509-validation;
|
||||
hspec-wai = pkgs-unoptimized.haskellPackages.hspec-wai;
|
||||
http-client-tls = pkgs-unoptimized.haskellPackages.http-client-tls;
|
||||
http2 = pkgs-unoptimized.haskellPackages.http2;
|
||||
pandoc = pkgs-unoptimized.haskellPackages.pandoc;
|
||||
pandoc-cli = pkgs-unoptimized.haskellPackages.pandoc-cli;
|
||||
pandoc-lua-engine = pkgs-unoptimized.haskellPackages.pandoc-lua-engine;
|
||||
pandoc-server = pkgs-unoptimized.haskellPackages.pandoc-server;
|
||||
servant-server = pkgs-unoptimized.haskellPackages.servant-server;
|
||||
tls = pkgs-unoptimized.haskellPackages.tls;
|
||||
wai-app-static = pkgs-unoptimized.haskellPackages.wai-app-static;
|
||||
wai-extra = pkgs-unoptimized.haskellPackages.wai-extra;
|
||||
warp = pkgs-unoptimized.haskellPackages.warp;
|
||||
inherit (pkgs-unoptimized.haskellPackages)
|
||||
crypton
|
||||
crypton-connection
|
||||
crypton-x509
|
||||
crypton-x509-store
|
||||
crypton-x509-system
|
||||
crypton-x509-validation
|
||||
hspec-wai
|
||||
http-client-tls
|
||||
http2
|
||||
pandoc
|
||||
pandoc-cli
|
||||
pandoc-lua-engine
|
||||
pandoc-server
|
||||
servant-server
|
||||
tls
|
||||
wai-app-static
|
||||
wai-extra
|
||||
warp
|
||||
;
|
||||
}
|
||||
);
|
||||
})
|
||||
(final: prev: {
|
||||
gsl = pkgs-unoptimized.gsl;
|
||||
redis = pkgs-unoptimized.redis;
|
||||
valkey = pkgs-unoptimized.valkey;
|
||||
inherit (pkgs-unoptimized)
|
||||
gsl
|
||||
redis
|
||||
valkey
|
||||
;
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user