From dd889cdec5cb04278f89d8b185b4a9641a6e5bf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Thu, 4 Apr 2024 10:59:35 +0300 Subject: [PATCH] vno1-op5p: moving to btrfs --- flake.nix | 16 ++++++++-------- hosts/vno1-op5p/configuration.nix | 21 +++++++++++---------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/flake.nix b/flake.nix index a67837e..c500bef 100644 --- a/flake.nix +++ b/flake.nix @@ -167,14 +167,14 @@ ./hosts/vno1-op5p/configuration.nix home-manager.nixosModules.home-manager - agenix.nixosModules.default - { - age.secrets = { - motiejus-passwd-hash.file = ./secrets/motiejus_passwd_hash.age; - root-passwd-hash.file = ./secrets/root_passwd_hash.age; - sasl-passwd.file = ./secrets/postfix_sasl_passwd.age; - }; - } + #agenix.nixosModules.default + #{ + # age.secrets = { + # motiejus-passwd-hash.file = ./secrets/motiejus_passwd_hash.age; + # root-passwd-hash.file = ./secrets/root_passwd_hash.age; + # sasl-passwd.file = ./secrets/postfix_sasl_passwd.age; + # }; + #} ]; specialArgs = {inherit myData;} // inputs; diff --git a/hosts/vno1-op5p/configuration.nix b/hosts/vno1-op5p/configuration.nix index 9ac6cc5..44cb91b 100644 --- a/hosts/vno1-op5p/configuration.nix +++ b/hosts/vno1-op5p/configuration.nix @@ -1,5 +1,5 @@ { - config, + #config, myData, ... }: let @@ -11,7 +11,6 @@ in { ]; boot = { - supportedFilesystems = ["bcachefs"]; initrd = { kernelModules = ["usb_storage"]; luks.devices = { @@ -36,8 +35,8 @@ in { fileSystems = { "/" = { device = "/dev/mapper/luksroot"; - fsType = "bcachefs"; - options = ["noatime" "fix_errors"]; + fsType = "btrfs"; + options = ["noatime" "compress=zstd"]; }; "/boot" = { device = "${nvme}-part1"; @@ -52,8 +51,10 @@ in { base.users = { enable = true; - root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path; - user.hashedPasswordFile = config.age.secrets.motiejus-passwd-hash.path; + #root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path; + #user.hashedPasswordFile = config.age.secrets.motiejus-passwd-hash.path; + root.initialPassword = "live"; + user.hashedPasswordFile = "live"; }; services = { @@ -61,10 +62,10 @@ in { node_exporter.enable = true; sshguard.enable = true; - postfix = { - enable = true; - saslPasswdPath = config.age.secrets.sasl-passwd.path; - }; + #postfix = { + # enable = true; + # saslPasswdPath = config.age.secrets.sasl-passwd.path; + #}; deployerbot = { follower = {