diff --git a/flake.nix b/flake.nix index 222afd1..5a3ad4a 100644 --- a/flake.nix +++ b/flake.nix @@ -84,8 +84,8 @@ ./extras/dev.nix ./extras/gaming.nix ./extras/folding.nix - nixos-cosmic.nixosModules.default - ./extras/cosmic.nix + # nixos-cosmic.nixosModules.default + # ./extras/cosmic.nix ]; }; NOlaptop = nixpkgs.lib.nixosSystem { diff --git a/secrets/password-tao.age b/secrets/password-tao.age index c8bb6cf..29bf730 100644 Binary files a/secrets/password-tao.age and b/secrets/password-tao.age differ diff --git a/users/tao.nix b/users/tao.nix index 9450549..385188c 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -152,7 +152,11 @@ services.snapper.configs = { home = { SUBVOLUME = "/home"; - FSTYPE = "bcachefs"; + # FSTYPE = "bcachefs"; + FSTYPE = + if lib.nixosSystem == "NOlaptop" + then "bcachefs" + else "btrfs"; ALLOW_USERS = ["tao"]; TIMELINE_CREATE = true; TIMELINE_CLEANUP = true; @@ -187,7 +191,7 @@ age.secrets.password-tao.file = ../secrets/syncthing-uwuraid.age; users.users.tao = { isNormalUser = true; - passwordFile = config.age.secrets.password-tao.path; + hashedPasswordFile = config.age.secrets.password-tao.path; extraGroups = ["audio" "video" "wheel" "libvirtd" "dialout" "game"]; shell = pkgs.nushell; };