diff options
| -rw-r--r-- | flake.nix | 1 | ||||
| -rw-r--r-- | hosts/jupiter/default.nix | 1 | ||||
| -rw-r--r-- | hosts/jupiter/hardware-configuration.nix | 29 |
3 files changed, 2 insertions, 29 deletions
@@ -121,6 +121,7 @@ jupiter = nixpkgs.lib.nixosSystem rec { specialArgs = { inherit inputs outputs; }; modules = [ + disko.nixosModules.disko ./hosts/jupiter home-manager.nixosModules.home-manager { #home-manager.sharedModules = [ sops-nix.homeManagerModules.sops ]; diff --git a/hosts/jupiter/default.nix b/hosts/jupiter/default.nix index ecdc3f9..269a51b 100644 --- a/hosts/jupiter/default.nix +++ b/hosts/jupiter/default.nix @@ -18,6 +18,7 @@ ]; imports = [ + ./disks.nix ./hardware-configuration.nix ../common/core ../common/optional/misc.nix diff --git a/hosts/jupiter/hardware-configuration.nix b/hosts/jupiter/hardware-configuration.nix index 96dd160..051169d 100644 --- a/hosts/jupiter/hardware-configuration.nix +++ b/hosts/jupiter/hardware-configuration.nix @@ -13,35 +13,6 @@ boot.kernelModules = [ "kvm-amd" ]; 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"; } - ]; - #nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; #hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } |