diff --git a/hosts/home-nix/disk-config.nix b/hosts/home-nix/disk-config.nix index 53c7eb0..919fbe9 100644 --- a/hosts/home-nix/disk-config.nix +++ b/hosts/home-nix/disk-config.nix @@ -37,27 +37,69 @@ subvolumes = { "@" = { mountpoint = "/"; - mountOptions = [ "defaults" "ssd" "compress=zstd" "autodefrag" "noatime" "nodiscard" ]; + mountOptions = [ + "defaults" + "ssd" + "compress=zstd" + "autodefrag" + "noatime" + "nodiscard" + ]; }; "@root" = { mountpoint = "/root"; - mountOptions = [ "defaults" "ssd" "compress=zstd" "autodefrag" "noatime" "nodiscard" ]; + mountOptions = [ + "defaults" + "ssd" + "compress=zstd" + "autodefrag" + "noatime" + "nodiscard" + ]; }; "@home" = { mountpoint = "/home"; - mountOptions = [ "defaults" "ssd" "compress=zstd" "autodefrag" "noatime" "nodiscard" ]; + mountOptions = [ + "defaults" + "ssd" + "compress=zstd" + "autodefrag" + "noatime" + "nodiscard" + ]; }; "@nix" = { mountpoint = "/nix"; - mountOptions = [ "defaults" "ssd" "compress=zstd" "autodefrag" "noatime" "nodiscard" ]; + mountOptions = [ + "defaults" + "ssd" + "compress=zstd" + "autodefrag" + "noatime" + "nodiscard" + ]; }; "@var" = { mountpoint = "/var"; - mountOptions = [ "defaults" "ssd" "compress=zstd" "autodefrag" "noatime" "nodiscard" ]; + mountOptions = [ + "defaults" + "ssd" + "compress=zstd" + "autodefrag" + "noatime" + "nodiscard" + ]; }; "@games" = { mountpoint = "/games"; - mountOptions = [ "defaults" "ssd" "compress=zstd" "autodefrag" "noatime" "nodiscard" ]; + mountOptions = [ + "defaults" + "ssd" + "compress=zstd" + "autodefrag" + "noatime" + "nodiscard" + ]; }; }; }; diff --git a/hosts/home-nix/hardware-configuration.nix b/hosts/home-nix/hardware-configuration.nix index a2b4f44..e5e55af 100644 --- a/hosts/home-nix/hardware-configuration.nix +++ b/hosts/home-nix/hardware-configuration.nix @@ -26,6 +26,22 @@ boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; + environment.etc."crypttab".text = '' + datafs UUID=5ca962a7-537f-46ce-ba50-9cc9cefd012b /etc/secrets/datafs.key luks + ''; + + fileSystems."/data" = { + device = "/dev/disk/by-uuid/a8ea6a7b-3733-40d8-bee8-45806aaacfe1"; + fsType = "btrfs"; + options = [ + "defaults" + "compress=zstd" + "autodefrag" + "noatime" + "nofail" + ]; + }; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/modules/optionnals/hosts/home-nix.nix b/modules/optionnals/hosts/home-nix.nix index 6d5f844..c6d4bb8 100644 --- a/modules/optionnals/hosts/home-nix.nix +++ b/modules/optionnals/hosts/home-nix.nix @@ -127,5 +127,8 @@ }; }; - environment.systemPackages = [ pkgs.tor-browser ]; + environment.systemPackages = [ + pkgs.tor-browser + pkgs.nextcloud-client + ]; }