From d8f717cf2391f999c7f2761d30babba81d8ffe2f Mon Sep 17 00:00:00 2001 From: dadada Date: Sat, 17 Jun 2023 21:35:06 +0200 Subject: [PATCH] ninurta: Add storage --- nixos/ninurta/configuration.nix | 9 +-------- nixos/ninurta/hardware-configuration.nix | 23 +++++++++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/nixos/ninurta/configuration.nix b/nixos/ninurta/configuration.nix index 18dd57c..06f8945 100644 --- a/nixos/ninurta/configuration.nix +++ b/nixos/ninurta/configuration.nix @@ -70,13 +70,6 @@ in }; }; - fileSystems."/mnt/storage" = { - device = "/dev/disk/by-uuid/a34e36fc-d7dd-4ceb-93c4-48f9c2727cb7"; - mountPoint = "/mnt/storage"; - neededForBoot = false; - options = [ "nofail" ]; - }; - # TODO enable # dadada.borgServer = { # enable = true; @@ -91,7 +84,7 @@ in }; services.hydra = { - enable = true; + enable = false; package = pkgs.hydra-unstable; hydraURL = "https://hydra.dadada.li"; notificationSender = "hydra@localhost"; diff --git a/nixos/ninurta/hardware-configuration.nix b/nixos/ninurta/hardware-configuration.nix index 902d33f..f0f1f94 100644 --- a/nixos/ninurta/hardware-configuration.nix +++ b/nixos/ninurta/hardware-configuration.nix @@ -69,14 +69,21 @@ size = 32 * 1024; # 32 GByte }]; - # TODO systemd networkd - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp86s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; + + fileSystems."/mnt/storage" = + { + device = "/dev/disk/by-uuid/ce483e75-5886-4b03-a3f9-675b80560ac9"; + fsType = "btrfs"; + options = [ "subvol=root" "compress=zstd" ]; + }; + + + fileSystems."/mnt/storage/backup" = + { + device = "/dev/disk/by-uuid/ce483e75-5886-4b03-a3f9-675b80560ac9"; + fsType = "btrfs"; + options = [ "subvol=backups" "noatime" ]; + }; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";