diff options
| author | William Carroll <wpcarro@gmail.com> | 2022-07-05T16·43-0700 |
|---|---|---|
| committer | wpcarro <wpcarro@gmail.com> | 2022-07-22T03·02+0000 |
| commit | 33f6419d7efb777884c7c44dc2f00216fbd4191f (patch) | |
| tree | c34532b34db9d1500a1d78b2d61621688e955498 /users/wpcarro/nixos/ava | |
| parent | cd5fa69897fb0ab3abaf8b24e1a0eb482f933efc (diff) | |
refactor(wpcarro/nixos): Define shared nopn.nix module r/4313
Shared between `ava` and `tarasco`. Also define `lib/default.nix` to share utility functions like `usermod` between NixOS configurations. Change-Id: I65b8d37520426e164c9d5f722bee4731a3c6e641 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5942 Tested-by: BuildkiteCI Reviewed-by: wpcarro <wpcarro@gmail.com> Autosubmit: wpcarro <wpcarro@gmail.com>
Diffstat (limited to 'users/wpcarro/nixos/ava')
| -rw-r--r-- | users/wpcarro/nixos/ava/default.nix | 5 | ||||
| -rw-r--r-- | users/wpcarro/nixos/ava/hardware.nix | 31 |
2 files changed, 4 insertions, 32 deletions
diff --git a/users/wpcarro/nixos/ava/default.nix b/users/wpcarro/nixos/ava/default.nix index 47a93ed2ef7c..ace2c81cfdbe 100644 --- a/users/wpcarro/nixos/ava/default.nix +++ b/users/wpcarro/nixos/ava/default.nix @@ -3,6 +3,7 @@ let inherit (depot.users) wpcarro; + inherit (depot.users.wpcarro.lib) usermod; wpcarrosEmacs = wpcarro.emacs.nixos { load = [ ./ava.el ]; @@ -15,7 +16,9 @@ let }; in { - imports = [ ./hardware.nix ]; + imports = [ + (usermod "hardware/nopn.nix") + ]; # Use the TVL binary cache tvl.cache.enable = true; diff --git a/users/wpcarro/nixos/ava/hardware.nix b/users/wpcarro/nixos/ava/hardware.nix deleted file mode 100644 index 4bfdca1cc55a..000000000000 --- a/users/wpcarro/nixos/ava/hardware.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { - device = "/dev/disk/by-label/NIXROOT"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { - device = "/dev/disk/by-label/NIXBOOT"; - fsType = "vfat"; - }; - - swapDevices = [ ]; - - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - # high-resolution display - hardware.video.hidpi.enable = lib.mkDefault true; -} |