diff options
| author | Profpatsch <mail@profpatsch.de> | 2021-06-07 18:38:43 +0200 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2021-06-07 19:09:32 +0200 |
| commit | 9df61b92d8211f4f45ca98e611a60f27bf992ce7 (patch) | |
| tree | 1b736b1348eae0faffd3ba2636f0d8695f99e4fb /machines/profpatsch | |
| parent | 34a007012bb0cb556d8be11987cf96476a7a5344 (diff) | |
machines/shiki: T450 -> T480
Needs a new name, hm.
Diffstat (limited to 'machines/profpatsch')
| -rw-r--r-- | machines/profpatsch/base-workstation.nix | 5 | ||||
| -rw-r--r-- | machines/profpatsch/shiki.nix | 17 |
2 files changed, 6 insertions, 16 deletions
diff --git a/machines/profpatsch/base-workstation.nix b/machines/profpatsch/base-workstation.nix index dd6f191c..0b37a284 100644 --- a/machines/profpatsch/base-workstation.nix +++ b/machines/profpatsch/base-workstation.nix @@ -17,11 +17,6 @@ in { ########### # Hardware - boot.loader = { - grub.enable = true; - grub.version = 2; - }; - hardware.cpu.intel.updateMicrocode = true; networking = { diff --git a/machines/profpatsch/shiki.nix b/machines/profpatsch/shiki.nix index 8824d4c2..5b0f1e85 100644 --- a/machines/profpatsch/shiki.nix +++ b/machines/profpatsch/shiki.nix @@ -29,23 +29,18 @@ in { ######### # Kernel - boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" ]; - boot.loader.grub.device = "/dev/disk/by-id/ata-CT500MX500SSD1_1809E130BEE8"; - - boot.initrd.luks.devices.cryptroot.device = "/dev/disk/by-uuid/2e1c433f-4a54-4f04-9073-3639b66b975d"; + boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.luks.devices.cryptroot.device = "/dev/disk/by-uuid/99922061-f883-4384-b1d9-a02d2ea88e59"; + boot.loader.systemd-boot.enable = true; + boot.loader.grub.enable = false; ########### # Hardware fileSystems."/" = { - device = "/dev/disk/by-uuid/5339f027-df78-437b-8a4c-39b93abc40b9"; + device = "/dev/disk/by-uuid/d88fb591-afa8-428f-bc24-5c096bcd762d"; fsType = "btrfs"; - options = [ "ssd" "subvol=/katarafs" ]; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/53042c4f-bbf2-418b-bf85-5d148ab5dda0"; - fsType = "ext3"; + options = [ "ssd" "subvol=/root" ]; }; hardware.trackpoint = { |