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 0972f71..8b1ed2b 100644 Binary files a/hosts/nom/secrets/local.nix.age and b/hosts/nom/secrets/local.nix.age differ