aboutsummaryrefslogtreecommitdiffstats
path: root/hosts/darkstar
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/darkstar
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/darkstar/default.nix1
-rw-r--r--hosts/darkstar/disks.nix4
-rw-r--r--hosts/darkstar/hardware-configuration.nix46
3 files changed, 3 insertions, 48 deletions
diff --git a/hosts/darkstar/default.nix b/hosts/darkstar/default.nix
index ac07076..6af2c54 100644
--- a/hosts/darkstar/default.nix
+++ b/hosts/darkstar/default.nix
@@ -27,6 +27,7 @@
#];
imports = [
+ ./disks.nix
./hardware-configuration.nix
./services.nix
../common/core
diff --git a/hosts/darkstar/disks.nix b/hosts/darkstar/disks.nix
index 7f1df4f..6bb21c9 100644
--- a/hosts/darkstar/disks.nix
+++ b/hosts/darkstar/disks.nix
@@ -14,7 +14,7 @@
type = "filesystem";
format = "vfat";
mountpoint = "/efiboot/efi1";
- mountOptions = [ "defaults" ];
+ mountOptions = [ "X-mount.mkdir" "umask=0077" ];
extraArgs = [ "-nESP1" ];
};
};
@@ -49,7 +49,7 @@
type = "filesystem";
format = "vfat";
mountpoint = "/efiboot/efi2";
- mountOptions = [ "defaults" ];
+ mountOptions = [ "X-mount.mkdir" "umask=0077" ];
extraArgs = [ "-nESP2" ];
};
};
diff --git a/hosts/darkstar/hardware-configuration.nix b/hosts/darkstar/hardware-configuration.nix
index 49cc244..d4a76e7 100644
--- a/hosts/darkstar/hardware-configuration.nix
+++ b/hosts/darkstar/hardware-configuration.nix
@@ -13,51 +13,5 @@
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
- fileSystems."/" =
- { device = "rpool/local/root";
- fsType = "zfs";
- };
-
- fileSystems."/efiboot/efi1" =
- { device = "/dev/disk/by-label/ESP1";
- fsType = "vfat";
- options = [ "X-mount.mkdir" "iocharset=iso8859-1" ];
- };
-
- fileSystems."/efiboot/efi2" =
- { device = "/dev/disk/by-label/ESP2";
- fsType = "vfat";
- options = [ "X-mount.mkdir" "iocharset=iso8859-1" ];
- };
-
- 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/swap1"; }
- { device = "/dev/disk/by-label/swap2"; }
- ];
-
- # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
- # (the default) this is the recommended approach. When using systemd-networkd it's
- # still possible to use this option, but it's recommended to use it in conjunction
- # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
- networking.useDHCP = lib.mkDefault true;
- # networking.interfaces.enp116s0.useDHCP = lib.mkDefault true;
- # networking.interfaces.enp117s0.useDHCP = lib.mkDefault true;
- # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
-
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}