james/nil
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Splitting apart host file

Browse Source
This commit is contained in:
James Patrick 2022-08-12 23:33:38 -04:00
parent 72b31a08ea
commit 3222c3b3d9
3 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@ -45,7 +45,7 @@
hosts = { hosts = {
nil.modules = [ nil.modules = [
nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen2 nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen2
./hosts/nil.nix ./hosts/nil
]; ];
}; };

21
hosts/nil/default.nix Normal file
View File

@ -0,0 +1,21 @@
# This is nil.
# Nil is my currently my primary personal machine. It is a AMD Thinkpad T14 G2.
# Specs can be can be found in hardware.nix
{ self, config, lib, pkgs, modulesPath, ... }:
{
imports = [
./hardware.nix
../../profiles/laptop.nix
(modulesPath + "/installer/scan/not-detected.nix")
];
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "22.05"; # Did you read the comment?
}

31
hosts/nil.nix → hosts/nil/hardware.nix
View File

@ -1,6 +1,5 @@
# This is nil. # Build Specs
# Nil is my current personal machine. It is a AMD Thinkpad T14 G2 with the follow specs; # ###############################################################################
#
# Onboard Memory: 16 GB DDR4 3200MHz (Soldered) Note: This can support another stick of RAM. # Onboard Memory: 16 GB DDR4 3200MHz (Soldered) Note: This can support another stick of RAM.
# Wireless: Realtek 8852AE 802.11AX (2 x 2) & Bluetooth® 5.2 # Wireless: Realtek 8852AE 802.11AX (2 x 2) & Bluetooth® 5.2
# Processor: AMD Ryzen™ 5 Pro 5650U Processor (2.30 GHz, up to 4.20 GHz Max Boost, 6 Cores, 12 Threads, 16 MB Cache) # Processor: AMD Ryzen™ 5 Pro 5650U Processor (2.30 GHz, up to 4.20 GHz Max Boost, 6 Cores, 12 Threads, 16 MB Cache)
@ -26,14 +25,7 @@
# ├─rpool/root zfs # ├─rpool/root zfs
# ├─rpool/root/nixos zfs / # ├─rpool/root/nixos zfs /
# └─rpool/home zfs /home # └─rpool/home zfs /home
{ config, lib, pkgs, modulesPath, ... }: { self, config, lib, pkgs, modulesPath, ... }: {
{
imports = [
../profiles/laptop.nix
(modulesPath + "/installer/scan/not-detected.nix")
];
this.system = { this.system = {
zfs.enable = true; zfs.enable = true;
yubikey.enable = true; yubikey.enable = true;
@ -70,6 +62,10 @@
"cryptd" "cryptd"
]; ];
kernelModules = [ "dm-snapshot" ]; kernelModules = [ "dm-snapshot" ];
luks.devices."crypt" = {
device = "/dev/disk/by-partlabel/crypt";
preLVM = true;
};
}; };
kernelModules = [ "kvm-amd" ]; kernelModules = [ "kvm-amd" ];
# Need for https://github.com/NixOS/nixpkgs/issues/177844 # Need for https://github.com/NixOS/nixpkgs/issues/177844
@ -78,11 +74,6 @@
supportedFilesystems = [ "zfs" ]; supportedFilesystems = [ "zfs" ];
}; };
boot.initrd.luks.devices."crypt" = {
device = "/dev/disk/by-partlabel/crypt";
preLVM = true;
};
fileSystems = { fileSystems = {
"/" = { "/" = {
device = "rpool/root/nixos"; device = "rpool/root/nixos";
@ -99,12 +90,4 @@
}; };
swapDevices = [{ device = "/dev/partitions/swap"; }]; swapDevices = [{ device = "/dev/partitions/swap"; }];
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "22.05"; # Did you read the comment?
} }