From 235cdd44428d6afdcbceb4078ed643585960f36b Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 21 Jan 2025 11:41:30 +0000 Subject: [PATCH 1/2] minor modification --- hosts/citadel/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hosts/citadel/default.nix b/hosts/citadel/default.nix index 4872b72..b10b81e 100644 --- a/hosts/citadel/default.nix +++ b/hosts/citadel/default.nix @@ -11,10 +11,7 @@ fsType = "btrfs"; # one of ext4 or btrfs. Use btrfs if using impermanence dev = "/dev/nvme0n1"; # depends on target hardware encrypted = true; # currrently only applies to btrfs - btrfsMountDevice = - if encrypted - then "/dev/mapper/crypted" - else "/dev/root_vg/root"; + btrfsMountDevice = "/dev/mapper/crypted"; user = "sam"; impermanence = true; piholeIp = configVars.networking.addresses.pihole.ip; From 1d5dc592ad7a3bd44f013c8a356a7b4e272c59f8 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 21 Jan 2025 17:17:27 +0000 Subject: [PATCH 2/2] remove containers and mounts from semita] --- hosts/semita/default.nix | 46 ++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/hosts/semita/default.nix b/hosts/semita/default.nix index 13a72c3..55af63f 100644 --- a/hosts/semita/default.nix +++ b/hosts/semita/default.nix @@ -57,17 +57,17 @@ in { # # bind mounts # ../common/optional/fileserver/bind-mounts/homeshare.nix - ../common/optional/fileserver/nfs-server/homeshare.nix + # ../common/optional/fileserver/nfs-server/homeshare.nix # nixos-containers - ../common/optional/nixos-containers/nix-bitcoin.nix - ../common/optional/nixos-containers/postgres.nix - ../common/optional/nixos-containers/baseddata-worker.nix - ../common/optional/nixos-containers/semitamaps-worker.nix - ../common/optional/nixos-containers/backup-server.nix - ../common/optional/nixos-containers/docker.nix - ../common/optional/nixos-containers/pihole.nix - ../common/optional/nixos-containers/metrics-server.nix + # ../common/optional/nixos-containers/nix-bitcoin.nix + # ../common/optional/nixos-containers/postgres.nix + # ../common/optional/nixos-containers/baseddata-worker.nix + # ../common/optional/nixos-containers/semitamaps-worker.nix + # ../common/optional/nixos-containers/backup-server.nix + # ../common/optional/nixos-containers/docker.nix + # ../common/optional/nixos-containers/pihole.nix + # ../common/optional/nixos-containers/metrics-server.nix # # Build nix derivations on remote machine # ../common/optional/distributed-builds/local-machine.nix @@ -75,11 +75,11 @@ in { outputs.nixosModules.nixosAutoUpgrade ]; - fileSystems."/mnt/main-ssd" = { - device = "/dev/disk/by-uuid/ba884006-e813-4b67-9fe6-62aea08b3b59"; - fsType = "ext4"; - }; - + # fileSystems."/mnt/main-ssd" = { + # device = "/dev/disk/by-uuid/ba884006-e813-4b67-9fe6-62aea08b3b59"; + # fsType = "ext4"; + # }; + # services.tailscale.useRoutingFeatures = "server"; boot = { @@ -104,15 +104,15 @@ in { }; }; - services.prometheus = { - exporters = { - node = { - enable = true; - enabledCollectors = ["systemd"]; - openFirewall = true; - }; - }; - }; + # services.prometheus = { + # exporters = { + # node = { + # enable = true; + # enabledCollectors = ["systemd"]; + # openFirewall = true; + # }; + # }; + # }; system.services.nixosAutoUpgrade = { enable = true;