sam
/
nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' of git.bitlab21.com:sam/nixos into development

This commit is contained in:
Sam 2025-01-21 17:17:57 +00:00
parent ca31181af0 1d5dc592ad
commit 4e57f67e92
2 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hosts/citadel/default.nix
View File

@ -11,10 +11,7 @@
fsType = "btrfs"; # one of ext4 or btrfs. Use btrfs if using impermanence fsType = "btrfs"; # one of ext4 or btrfs. Use btrfs if using impermanence
dev = "/dev/nvme0n1"; # depends on target hardware dev = "/dev/nvme0n1"; # depends on target hardware
encrypted = true; # currrently only applies to btrfs encrypted = true; # currrently only applies to btrfs
btrfsMountDevice = btrfsMountDevice = "/dev/mapper/crypted";
if encrypted
then "/dev/mapper/crypted"
else "/dev/root_vg/root";
user = "sam"; user = "sam";
impermanence = true; impermanence = true;
piholeIp = configVars.networking.addresses.pihole.ip; piholeIp = configVars.networking.addresses.pihole.ip;

46
hosts/semita/default.nix
View File

@ -57,17 +57,17 @@ in {
# # bind mounts # # bind mounts
# ../common/optional/fileserver/bind-mounts/homeshare.nix # ../common/optional/fileserver/bind-mounts/homeshare.nix
../common/optional/fileserver/nfs-server/homeshare.nix # ../common/optional/fileserver/nfs-server/homeshare.nix
# nixos-containers # nixos-containers
../common/optional/nixos-containers/nix-bitcoin.nix # ../common/optional/nixos-containers/nix-bitcoin.nix
../common/optional/nixos-containers/postgres.nix # ../common/optional/nixos-containers/postgres.nix
../common/optional/nixos-containers/baseddata-worker.nix # ../common/optional/nixos-containers/baseddata-worker.nix
../common/optional/nixos-containers/semitamaps-worker.nix # ../common/optional/nixos-containers/semitamaps-worker.nix
../common/optional/nixos-containers/backup-server.nix # ../common/optional/nixos-containers/backup-server.nix
../common/optional/nixos-containers/docker.nix # ../common/optional/nixos-containers/docker.nix
../common/optional/nixos-containers/pihole.nix # ../common/optional/nixos-containers/pihole.nix
../common/optional/nixos-containers/metrics-server.nix # ../common/optional/nixos-containers/metrics-server.nix
# # Build nix derivations on remote machine # # Build nix derivations on remote machine
# ../common/optional/distributed-builds/local-machine.nix # ../common/optional/distributed-builds/local-machine.nix
@ -75,11 +75,11 @@ in {
outputs.nixosModules.nixosAutoUpgrade outputs.nixosModules.nixosAutoUpgrade
]; ];
fileSystems."/mnt/main-ssd" = { # fileSystems."/mnt/main-ssd" = {
device = "/dev/disk/by-uuid/ba884006-e813-4b67-9fe6-62aea08b3b59"; # device = "/dev/disk/by-uuid/ba884006-e813-4b67-9fe6-62aea08b3b59";
fsType = "ext4"; # fsType = "ext4";
}; # };
#
services.tailscale.useRoutingFeatures = "server"; services.tailscale.useRoutingFeatures = "server";
boot = { boot = {
@ -104,15 +104,15 @@ in {
}; };
}; };
services.prometheus = { # services.prometheus = {
exporters = { # exporters = {
node = { # node = {
enable = true; # enable = true;
enabledCollectors = ["systemd"]; # enabledCollectors = ["systemd"];
openFirewall = true; # openFirewall = true;
}; # };
}; # };
}; # };
system.services.nixosAutoUpgrade = { system.services.nixosAutoUpgrade = {
enable = true; enable = true;