mirrors_public/oddlama_nix-config
1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-10 23:00:39 +02:00
Code Activity

chore: miscellaneous necessary refactors post-update

Browse source
This commit is contained in:
oddlama 2024-03-02 14:06:34 +01:00
parent 6ce119d871
commit 5aad6c3a84
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
11 changed files with 48 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

9
hosts/kroma/default.nix
View file

@ -2,8 +2,6 @@
inputs,
lib,
minimal,
pkgs,
#nodes,
...
}:
{
@ -59,13 +57,6 @@
nix.settings.trusted-substituters = ["https://ai.cachix.org"];
nix.settings.trusted-public-keys = ["ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc="];
nixpkgs.config.permittedInsecurePackages = lib.warnIf (pkgs.obsidian.version != "1.5.3") "REMOVE THIS obsidian electron override! in kroma.nix" [
"electron-25.9.0"
];
# BUG: remove when https://github.com/NixOS/nixpkgs/issues/280826 is merged
environment.systemPackages = lib.trace "remove pcsclite polkit override https://github.com/NixOS/nixpkgs/issues/280826" [pkgs.pcscliteWithPolkit.out];
#meta.promtail = {
# enable = true;
# proxy = "sentinel";

24
hosts/kroma/fs.nix
View file

@ -11,26 +11,14 @@ in {
type = "disk";
device = "/dev/disk/by-id/${disks.m2-ssd}";
content = with lib.disko.gpt; {
type = "table";
format = "gpt";
partitions = [
(partEfi "efi" "0%" "1GiB")
(partSwap "swap" "1GiB" "17GiB")
(partLuksZfs disks.m2-ssd "rpool" "17GiB" "100%")
];
type = "gpt";
partitions = {
efi = partEfi "0%" "1GiB";
swap = partSwap "1GiB" "17GiB";
"rpool_${disks.m2-ssd}" = partLuksZfs disks.m2-ssd "rpool" "17GiB" "100%";
};
};
};
#data-hdd = {
# type = "disk";
# device = "/dev/disk/by-id/${config.repo.secrets.local.disk.data-hdd}";
# content = with lib.disko.gpt; {
# type = "table";
# format = "gpt";
# partitions = [
# (partLuksZfs "data" "0%" "100%")
# ];
# };
#};
};
zpool = with lib.disko.zfs; {
rpool = mkZpool {datasets = impermanenceZfsDatasets;};