From 8bc20646637f8bef4e9b609e8554461de186a283 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Tue, 7 Mar 2023 22:26:49 -0500 Subject: [PATCH] switched to disko on moms-laptop --- systems/moms-laptop/default.nix | 21 ++---------------- systems/moms-laptop/disko.nix | 39 +++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 19 deletions(-) create mode 100644 systems/moms-laptop/disko.nix diff --git a/systems/moms-laptop/default.nix b/systems/moms-laptop/default.nix index 632f732..d03b224 100644 --- a/systems/moms-laptop/default.nix +++ b/systems/moms-laptop/default.nix @@ -6,6 +6,7 @@ inputs: { }: { imports = [ (import ./printing.nix inputs) + (import ./disko.nix inputs) ]; localModules = { DM = { @@ -31,7 +32,7 @@ inputs: { ]; services.xserver.videoDrivers = ["intel"]; networking = { - hostName = "mom-laptop"; + hostName = "moms-laptop"; networkmanager.enable = true; }; boot.kernelPackages = pkgs.linuxPackages_latest; @@ -62,22 +63,4 @@ inputs: { initrd.availableKernelModules = ["xhci-pci" "ehci-pci" "ahci" "usbhid" "sd_mod" "sr_mod" "rtsx_usb_sdmmc"]; kernelModules = ["kvm-intel"]; }; - fileSystems = { - "/" = { - device = "/dev/disk/by-uuid/518885c4-2d43-46a5-bf17-c734b7b85c2e"; - fsType = "ext4"; - label = "nixos"; - noCheck = false; - mountPoint = "/"; - neededForBoot = true; - }; - "/boot" = { - device = "/dev/disk/by-uuid/5BCE-813C"; - fsType = "vfat"; - label = "BOOT"; - noCheck = false; - mountPoint = "/boot"; - neededForBoot = true; - }; - }; } diff --git a/systems/moms-laptop/disko.nix b/systems/moms-laptop/disko.nix new file mode 100644 index 0000000..6888d14 --- /dev/null +++ b/systems/moms-laptop/disko.nix @@ -0,0 +1,39 @@ +_: { + disko.devices = { + disk.sda = { + device = "/dev/disk/by-id/ata-WDC_WDS240G2G0A-00JH30_180936803144"; + type = "disk"; + content = { + type = "table"; + format = "gpt"; + partitions = [ + { + type = "partition"; + name = "ESP"; + start = "1049KB"; + end = "525MB"; + bootable = true; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + }; + } + { + name = "root"; + type = "partition"; + start = "525MB"; + end = "100%"; + part-type = "primary"; + bootable = true; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/"; + }; + } + ]; + }; + }; + }; +}