aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--flake.nix2
-rw-r--r--hosts/richese/default.nix1
-rw-r--r--hosts/richese/disks.nix2
-rw-r--r--hosts/richese/hardware-configuration.nix29
4 files changed, 3 insertions, 31 deletions
diff --git a/flake.nix b/flake.nix
index df50eea..f87cd07 100644
--- a/flake.nix
+++ b/flake.nix
@@ -168,7 +168,7 @@
richese = nixpkgs.lib.nixosSystem rec {
specialArgs = { inherit inputs outputs; };
modules = [
- #disko.nixosModules.disko
+ disko.nixosModules.disko
./hosts/richese
home-manager.nixosModules.home-manager {
home-manager.users.root = import ./home/root/richese.nix;
diff --git a/hosts/richese/default.nix b/hosts/richese/default.nix
index 5cf92c2..a57e142 100644
--- a/hosts/richese/default.nix
+++ b/hosts/richese/default.nix
@@ -13,6 +13,7 @@
];
imports = [
+ ./disks.nix
./hardware-configuration.nix
../common/core
#../common/optional/db.nix
diff --git a/hosts/richese/disks.nix b/hosts/richese/disks.nix
index 612c215..02c6ffe 100644
--- a/hosts/richese/disks.nix
+++ b/hosts/richese/disks.nix
@@ -7,7 +7,7 @@
content = {
type = "gpt";
partitions = {
- bios = {
+ MBR = {
size = "4M";
type = "EF02";
};
diff --git a/hosts/richese/hardware-configuration.nix b/hosts/richese/hardware-configuration.nix
index e4e04cf..d1c33b7 100644
--- a/hosts/richese/hardware-configuration.nix
+++ b/hosts/richese/hardware-configuration.nix
@@ -12,33 +12,4 @@
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
-
- fileSystems."/" =
- { device = "rpool/local/root";
- fsType = "zfs";
- };
-
- fileSystems."/boot" =
- { device = "/dev/disk/by-label/boot";
- fsType = "vfat";
- };
-
- fileSystems."/nix" =
- { device = "rpool/local/nix";
- fsType = "zfs";
- };
-
- fileSystems."/root" =
- { device = "rpool/user/home/root";
- fsType = "zfs";
- };
-
- fileSystems."/home/nipsy" =
- { device = "rpool/user/home/nipsy";
- fsType = "zfs";
- };
-
- swapDevices =
- [ { device = "/dev/disk/by-label/swap"; }
- ];
}