aboutsummaryrefslogtreecommitdiffstats
path: root/hosts/ginaz
diff options
context:
space:
mode:
authorMark Nipper <nipsy@bitgnome.net>2024-11-12 10:04:38 -0800
committerMark Nipper <nipsy@bitgnome.net>2024-11-12 10:04:38 -0800
commit8328e393ce834ecb6038698d6649427ea1be4a0f (patch)
tree4f1d6c3c5f7108d6a4b7ea800f3c6127528f276f /hosts/ginaz
parent80a6beccba107f0a728c038a79914e084ab097a7 (diff)
downloadnix-8328e393ce834ecb6038698d6649427ea1be4a0f.tar
nix-8328e393ce834ecb6038698d6649427ea1be4a0f.tar.gz
nix-8328e393ce834ecb6038698d6649427ea1be4a0f.tar.bz2
nix-8328e393ce834ecb6038698d6649427ea1be4a0f.tar.lz
nix-8328e393ce834ecb6038698d6649427ea1be4a0f.tar.xz
nix-8328e393ce834ecb6038698d6649427ea1be4a0f.tar.zst
nix-8328e393ce834ecb6038698d6649427ea1be4a0f.zip
Modularize disko everywhere
Diffstat (limited to '')
-rw-r--r--hosts/ginaz/default.nix1
-rw-r--r--hosts/ginaz/disks.nix96
-rw-r--r--hosts/ginaz/hardware-configuration.nix67
3 files changed, 116 insertions, 48 deletions
diff --git a/hosts/ginaz/default.nix b/hosts/ginaz/default.nix
index 6ef3bef..58703b8 100644
--- a/hosts/ginaz/default.nix
+++ b/hosts/ginaz/default.nix
@@ -16,6 +16,7 @@
];
imports = [
+ ./disks.nix
./hardware-configuration.nix
../common/core
../common/optional/db.nix
diff --git a/hosts/ginaz/disks.nix b/hosts/ginaz/disks.nix
new file mode 100644
index 0000000..5093fe8
--- /dev/null
+++ b/hosts/ginaz/disks.nix
@@ -0,0 +1,96 @@
+{
+ disko.devices = {
+ disk = {
+ nvme0n1 = {
+ type = "disk";
+ device = "/dev/disk/by-id/nvme-SAMSUNG_MZVL21T0HCLR-00BL2_S64NNX0T233166";
+ content = {
+ type = "gpt";
+ partitions = {
+ ESP = {
+ size = "1G";
+ type = "EF00";
+ content = {
+ type = "filesystem";
+ format = "vfat";
+ mountpoint = "/boot";
+ mountOptions = [ "umask=0077" ];
+ extraArgs = [ "-nboot" ];
+ };
+ };
+ swap = {
+ size = "32G";
+ type = "8200";
+ content = {
+ type = "swap";
+ extraArgs = [ "-L swap" ];
+ };
+ };
+ rpool = {
+ size = "100%";
+ content = {
+ type = "zfs";
+ pool = "rpool";
+ };
+ };
+ };
+ };
+ };
+ };
+ zpool = {
+ rpool = {
+ type = "zpool";
+ rootFsOptions = {
+ acltype = "posixacl";
+ canmount = "off";
+ compression = "on";
+ dnodesize = "auto";
+ relatime = "on";
+ xattr = "sa";
+ };
+ options = {
+ ashift = "12";
+ autotrim = "on";
+ };
+ datasets = {
+ "local" = {
+ type = "zfs_fs";
+ options.mountpoint = "none";
+ };
+ "local/root" = {
+ type = "zfs_fs";
+ options.mountpoint = "legacy";
+ mountpoint = "/";
+ };
+ "local/nix" = {
+ type = "zfs_fs";
+ options = {
+ atime = "off";
+ mountpoint = "legacy";
+ };
+ mountpoint = "/nix";
+ };
+ "user" = {
+ type = "zfs_fs";
+ options.mountpoint = "none";
+ };
+ "user/home" = {
+ type = "zfs_fs";
+ options.mountpoint = "legacy";
+ mountpoint = "/home";
+ };
+ "user/home/root" = {
+ type = "zfs_fs";
+ options.mountpoint = "legacy";
+ mountpoint = "/root";
+ };
+ "user/home/nipsy" = {
+ type = "zfs_fs";
+ options.mountpoint = "legacy";
+ mountpoint = "/home/nipsy";
+ };
+ };
+ };
+ };
+ };
+}
diff --git a/hosts/ginaz/hardware-configuration.nix b/hosts/ginaz/hardware-configuration.nix
index 6a773e6..cbfda8a 100644
--- a/hosts/ginaz/hardware-configuration.nix
+++ b/hosts/ginaz/hardware-configuration.nix
@@ -13,57 +13,28 @@
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
- fileSystems."/" =
- { device = "rpool/local/root";
- fsType = "zfs";
+ hardware = {
+ bluetooth.enable = true;
+ #bluetooth.powerOnBoot = true;
+
+ graphics = {
+ enable = true;
+ extraPackages = with pkgs; [ nvidia-vaapi-driver ];
+ extraPackages32 = with pkgs.pkgsi686Linux; [ nvidia-vaapi-driver ];
};
- 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"; }
- ];
-
- hardware = {
- bluetooth.enable = true;
- #bluetooth.powerOnBoot = true;
-
- graphics = {
- enable = true;
- extraPackages = with pkgs; [ nvidia-vaapi-driver ];
- extraPackages32 = with pkgs.pkgsi686Linux; [ nvidia-vaapi-driver ];
- };
-
- nvidia = {
- modesetting.enable = true;
- open = true;
- package = config.boot.kernelPackages.nvidiaPackages.beta;
- prime = {
- amdgpuBusId = "PCI:4:0:0";
- nvidiaBusId = "PCI:1:0:0";
- offload = {
- enable = true;
- enableOffloadCmd = true;
- };
+ nvidia = {
+ modesetting.enable = true;
+ open = true;
+ package = config.boot.kernelPackages.nvidiaPackages.beta;
+ prime = {
+ amdgpuBusId = "PCI:4:0:0";
+ nvidiaBusId = "PCI:1:0:0";
+ offload = {
+ enable = true;
+ enableOffloadCmd = true;
};
};
};
+ };
}