add disko and update config for fred

This commit is contained in:
Don Harper 2024-01-04 22:15:10 -06:00
parent 429a368e3d
commit c2a0dfab64
4 changed files with 50 additions and 6 deletions

View file

@ -1,5 +1,6 @@
{ {
inputs = { inputs = {
disko.url = "github:nix-community/disko";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = { home-manager = {
@ -25,6 +26,7 @@
workstation = { workstation = {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
inputs.disko.nixosModules.disko
./workstation ./workstation
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
./home ./home
@ -34,6 +36,7 @@
server = { server = {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
inputs.disko.nixosModules.disko
./server ./server
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
./home ./home

View file

@ -4,5 +4,6 @@
imports = imports =
[ [
./hardware-configuration.nix ./hardware-configuration.nix
./disko.nix
]; ];
} }

40
hosts/fred/disko.nix Normal file
View file

@ -0,0 +1,40 @@
{
disko.devices = {
disk = {
vdb = {
device = "/dev/sda";
type = "disk";
content = {
type = "table";
format = "gpt";
partitions = [
{
name = "ESP";
start = "1M";
end = "500M";
bootable = true;
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
};
}
{
name = "root";
start = "500M";
end = "100%";
part-type = "primary";
bootable = true;
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/";
};
}
];
};
};
};
};
}

View file

@ -14,18 +14,18 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/90189466-8309-4b46-befe-cf476b8a7dd7"; { device = "/dev/sda2";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/A327-E803"; { device = "/dev/sda1";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = #swapDevices =
[ { device = "/dev/disk/by-uuid/13b6e2c4-b8f1-48c9-b992-bf2d172d9a25"; } #[ { device = "/dev/disk/by-uuid/13b6e2c4-b8f1-48c9-b992-bf2d172d9a25"; }
]; #];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's
@ -36,6 +36,6 @@
# networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; #powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }