From d8ad686e7b144d9e7672447ff55a16db90ec1486 Mon Sep 17 00:00:00 2001 From: notohh Date: Thu, 2 May 2024 00:58:11 -0400 Subject: [PATCH] tsuki: update hardware --- hosts/tsuki/disko-config.nix | 33 -------------------------------- hosts/tsuki/hardware.nix | 18 ++++++++--------- hosts/tsuki/services/default.nix | 2 +- 3 files changed, 9 insertions(+), 44 deletions(-) delete mode 100644 hosts/tsuki/disko-config.nix diff --git a/hosts/tsuki/disko-config.nix b/hosts/tsuki/disko-config.nix deleted file mode 100644 index 8dc6ba1..0000000 --- a/hosts/tsuki/disko-config.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - disko.devices = { - disk = { - nvme0n1 = { - device = "/dev/nvme0n1"; - type = "disk"; - content = { - type = "gpt"; - partitions = { - ESP = { - end = "500M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - }; - }; - root = { - name = "root"; - end = "-0"; - content = { - type = "filesystem"; - format = "bcachefs"; - mountpoint = "/"; - }; - }; - }; - }; - }; - }; - }; -} diff --git a/hosts/tsuki/hardware.nix b/hosts/tsuki/hardware.nix index 022e024..fa1202a 100755 --- a/hosts/tsuki/hardware.nix +++ b/hosts/tsuki/hardware.nix @@ -6,7 +6,6 @@ }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") - # ./disko-config.nix ]; boot = { @@ -29,20 +28,19 @@ }; fileSystems = { + "/" = { + device = "/dev/disk/by-uuid/a423d32f-ac5d-4ea2-82fb-f94b05afce29"; + fsType = "ext4"; + }; + "/boot/efi" = { + device = "/dev/disk/by-uuid/FEAF-138A"; + fsType = "vfat"; + }; "/nas/restic" = { device = "192.168.1.199:/mnt/Sutoreji/nix-restic-data/tsuki"; fsType = "nfs"; }; - "/nas/ISOS" = { - device = "192.168.1.199:/mnt/Sutoreji/ISOS"; - fsType = "nfs"; - }; - "/nas/osu-backups" = { - device = "192.168.1.199:/mnt/Sutoreji/osu-backups"; - fsType = "nfs"; - }; }; - networking.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/hosts/tsuki/services/default.nix b/hosts/tsuki/services/default.nix index e7e280b..35eee40 100644 --- a/hosts/tsuki/services/default.nix +++ b/hosts/tsuki/services/default.nix @@ -1,7 +1,7 @@ {...}: { imports = [ ./restic.nix - ./atticd.nix + # ./atticd.nix ./hydroxide.nix ]; }