From 04872f6ec51908e997408436300bcd3a3b52f8cd Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Sun, 25 Jun 2023 22:59:13 +0200
Subject: [PATCH] chore: clean up old nom config

---
 hosts/common/core/system.nix    |   1 +
 hosts/nom/default.nix           |   2 +-
 hosts/nom/disko.nix             |  94 --------------------------------
 hosts/nom/secrets/local.nix.age | Bin 616 -> 751 bytes
 4 files changed, 2 insertions(+), 95 deletions(-)
 delete mode 100644 hosts/nom/disko.nix

diff --git a/hosts/common/core/system.nix b/hosts/common/core/system.nix
index fa98a37..1c66acc 100644
--- a/hosts/common/core/system.nix
+++ b/hosts/common/core/system.nix
@@ -437,5 +437,6 @@
     oauth2_proxy = uidGid 987;
     influxdb2 = uidGid 986;
     telegraf = uidGid 985;
+    rtkit = uidGid 984;
   };
 }
diff --git a/hosts/nom/default.nix b/hosts/nom/default.nix
index 077bc29..8358712 100644
--- a/hosts/nom/default.nix
+++ b/hosts/nom/default.nix
@@ -18,7 +18,7 @@
     ../common/efi.nix
     ../common/initrd-ssh.nix
     ../common/laptop.nix
-    ../common/sound.nix
+    # ../common/sound.nix
     ../common/yubikey.nix
     ../common/zfs.nix
 
diff --git a/hosts/nom/disko.nix b/hosts/nom/disko.nix
deleted file mode 100644
index 4f9d39c..0000000
--- a/hosts/nom/disko.nix
+++ /dev/null
@@ -1,94 +0,0 @@
-# TODO subject for deletion (moves into fs.nix like for ward)
-{
-  nom = {
-    disk = {
-      "Intenso_SSD_3833430-532201046" = {
-        type = "disk";
-        device = "/dev/disk/by-id/ata-Intenso_SSD_3833430-532201046";
-        content = {
-          type = "table";
-          format = "gpt";
-          partitions = [
-            {
-              type = "partition";
-              name = "efi";
-              start = "2048";
-              end = "8GiB";
-              fs-type = "fat32";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-              };
-            }
-            {
-              type = "partition";
-              name = "swap";
-              start = "8GiB";
-              end = "100%";
-              content = {
-                type = "swap";
-                randomEncryption = true;
-              };
-            }
-          ];
-        };
-      };
-      "Samsung_SSD_980_PRO_1TB_S5GXNX1T325329W" = {
-        type = "disk";
-        device = "/dev/disk/by-id/nvme-Samsung_SSD_980_PRO_1TB_S5GXNX1T325329W";
-        content = {
-          type = "zfs";
-          pool = "rpool";
-        };
-      };
-    };
-    zpool = {
-      rpool = {
-        type = "zpool";
-        mode = "mirror";
-        rootFsOptions = {
-          compression = "zstd";
-          acltype = "posix";
-          atime = "off";
-          xattr = "sa";
-          dnodesize = "auto";
-          mountpoint = "none";
-          canmount = "off";
-          devices = "off";
-          encryption = "aes-256-gcm";
-          keyformat = "passphrase";
-          keylocation = "prompt";
-          "autobackup:snap" = "true";
-          "autobackup:home" = "true";
-        };
-        options = {
-          ashift = "12";
-          bootfs = "rpool/root/nixos";
-        };
-        datasets = {
-          "root" = {
-            zfs_type = "filesystem";
-          };
-          "root/nixos" = {
-            zfs_type = "filesystem";
-            options = {
-              canmount = "on";
-              mountpoint = "/";
-            };
-          };
-          "home" = {
-            zfs_type = "filesystem";
-          };
-          "home/root" = {
-            zfs_type = "filesystem";
-            options = {
-              canmount = "on";
-              mountpoint = "/root";
-            };
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/hosts/nom/secrets/local.nix.age b/hosts/nom/secrets/local.nix.age
index 0972f71d68512b71533771825ad74d6f8ee98a66..8b1ed2bea46ae8568004039f49a2be67e0b680c9 100644
GIT binary patch
delta 731
zcmV<10wn$D1n&iqAb&DRRz@#pG<s`!H$rJQdPZ?qR%dZSSx04II8Ab5W@mCvI7>}c
zP;+@!X9`I~Zc|J-G(js=LRe8nF*h_&Idy7UG<sB7HdIP_NMuZPS2I>MZB}S<O$seO
zAaH4REpRe5HXwL$Q)M_&AVGIdGC68tIA?5PM0iFuM`KiDN`FmrQc`JaFl$G5P-|vZ
zSz%~)NKQ;SWO)iTW_4jXFHvTBHdjPOaY|QeXl{8`MoLOWayBq$V{1)Fazis}SZrx4
zY&Z%nJ|JCgYdC5`W-VuOWnpt=AWceRSRhwHOFAGkN_%fxJ0LhtUUEopQ9BAUHaJB&
zX;(#3M=MlrF@IGrODkn|b$Kf<Of_;)OL2NeLS}MDHA{FmHZ)3XLUU_*YiTuMSz|PF
zVmUcUbyYZM3PpJ@cy&Z=bZSgVY->(UaWOV9Nk~doc1T59Zc}A>X-q3iVp45-Rzi6}
zWO8R@Mqy8FL1|E0N_S~jHVQ2*Eg(l@aavhsbZ%&Faeq^1cuPTUW;0q(O;Rs3VQ^3@
zGB<5CWM)!EZ%TP<c~uHY=?BLeA&3s^wj4fRB3Ai_bD))q%&S?JKKgNM6~|6KGK0pV
z`FLFFe+{U}GERG^I8zPeY#cFY=&P7M#b18<p&xYYUD6@rAdE*mYjAFxD6UkyOc5;%
zkF!~1Wq;LJp108oPVNcAr0n2BIh%yr5HAIE-A)Jr1}T0-ywaHC7K;*MF?I)XCOPWV
zFa(X#3S&+Rxo;*53TjFtV=B&xk9P0@_d+xtX}M#(td4WL7F!L?@vMZjgYEHV_-pNW
z*ntFj*4GFzsc{SdZ09^vzi6<@uW*Blt9(d!TU4hP?4pRGQD6gr)J0<)Zaj=J5~jy;
z;{4M#Fv~?5Lw?zSE)b*dX=bq}jv4#Iwk9kN%-@|bWC-1Nxf<|pcQ$;!jf)SGwYk&J
N9U4o1Pr`G{UZ?+{8AbpA

delta 595
zcmV-Z0<8V-1?U8jAb)ykY&bW1SZZWrX?8hyR%kLpaz|`YL@O^@NJ(Z(NH}gxSY%;T
zL1aQ{NeVbua#CY6Mqyz{VQ6M}Safb=WimooH+o5PNOoaGb#_*3Nl|c5MoDWiZwf6w
zAaH4REpRe5HXwL$Q)M_&AVGL(LU2%SLTztqW=U6Uad%mCVSi+IZ#iT(D=|VtHcU%b
zSTbr&Z9;2HSV;;@a4}?bHB&M|cz91kSXwhTYH~wVH8Oc|WI-=fZdO`EVn|tYX>56M
zX)p>cJ|K59EoX9NVRL05A!r~dL_$R?AS-((Vs=mpSYdWFa4=F&b$3Z?VRLvmRcdQO
zW;IbUHZN#vS${D>Mrt!tH8e_eYI<*HQa5X2MrBKDX+(N@M=N1Xb9Q!2MhaDUMO92u
zOjJomYDr{SGf7WGMMzIoG-Wa}No!eQM@d9>S9oV?H%)0dcsNr{S2-|gdNNZpPh@mO
zGzu*(Eg*SEO)qv#ZZTnFK{Q50S21jOXHR5rLRD;VaDPN_PDwLHL3&|Yb8|F$IaLY|
zW8&C>;CITN{$926qaWEeH7m^g8}8gsMeeW2j({H?DrL?Pg?==NiLnM`HK^^;?w+DM
zQ+4A4r{Q5&(*C;JI<qq4&j}KP4<LNcfKu|SFH!4YW5BJr9&Lvyllo2PEkrn5d*uh^
z7rf0kgG_QcRsgA}TPrR6@4?`n##JuNEnmLCBrJ;zt;lYYvFLsP>REaUO=DGdvpdgX
h;#R`nJan+`omPHpCy}}sOCLoW+lIE&rY@l|l=ip4<Ldwb