From b754c30b8c2882a8b4098dc34b41d6607708d837 Mon Sep 17 00:00:00 2001
From: Mark Nipper <nipsy@bitgnome.net>
Date: Fri, 3 May 2024 16:55:48 -0700
Subject: Reduce package set and update ZFS configuration

---
 hosts/darkstar/default.nix | 3 +--
 hosts/darkstar/disks.nix   | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'hosts')

diff --git a/hosts/darkstar/default.nix b/hosts/darkstar/default.nix
index 2e8d62c..556c7c5 100644
--- a/hosts/darkstar/default.nix
+++ b/hosts/darkstar/default.nix
@@ -18,7 +18,6 @@
       timeout = 3;
     };
     supportedFilesystems = [ "zfs" ];
-    zfs.devNodes = "/dev/disk/by-label";
   };
 
   #environment.systemPackages = with pkgs; [
@@ -34,7 +33,7 @@
     #../common/optional/ebooks.nix
     #../common/optional/games.nix
     #../common/optional/google-authenticator.nix
-    ../common/optional/misc.nix
+    #../common/optional/misc.nix
     #../common/optional/multimedia.nix
     #../common/optional/pipewire.nix
     #../common/optional/sdr.nix
diff --git a/hosts/darkstar/disks.nix b/hosts/darkstar/disks.nix
index 64bc36b..2d0682a 100644
--- a/hosts/darkstar/disks.nix
+++ b/hosts/darkstar/disks.nix
@@ -3,7 +3,7 @@
     disk = {
       nvme0n1 = {
         type = "disk";
-        device = "/dev/nvme0n1";
+        device = "/dev/disk/by-id/nvme-WDC_WDS100T2B0C-00PXH0_203822801246";
         content = {
           type = "gpt";
           partitions = {
@@ -38,7 +38,7 @@
       };
       nvme1n1 = {
         type = "disk";
-        device = "/dev/nvme1n1";
+        device = "/dev/disk/by-id/nvme-Corsair_MP600_MICRO_A828B35000EQBA";
         content = {
           type = "gpt";
           partitions = {
-- 
cgit v1.2.3