From 7efb03b4410227ab9cc942efe9a989d9bd167aa2 Mon Sep 17 00:00:00 2001 From: pagedmov Date: Sun, 17 Nov 2024 23:45:12 -0500 Subject: [PATCH] using hashedPassword in live-env config now, also added disko to flake inputs --- flake.nix | 5 ++++- hosts/live-env/config.nix | 28 ++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 4107db7..856bd75 100755 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,7 @@ hypr-contrib.url = "github:hyprwm/contrib"; hyprpicker.url = "github:hyprwm/hyprpicker"; stylix.url = "github:danth/stylix"; + disko.url = "github:nix-community/disko"; nixvim = { url = "github:nix-community/nixvim"; @@ -30,7 +31,7 @@ }; }; - outputs = { self, home-manager, nixpkgs, nur, nixvim, stylix, ... }@inputs: + outputs = { self, home-manager, disko, nixpkgs, nur, nixvim, stylix, ... }@inputs: let system = "x86_64-linux"; username = "pagedmov"; @@ -207,7 +208,9 @@ }; modules = [ ./hosts/live-env/config.nix + (import ./hosts/live-env/disko.nix { device = "/dev/sdd"; }) ./modules/sys + disko.nixosModules.default nixvim.nixosModules.nixvim stylix.nixosModules.stylix nur.nixosModules.nur diff --git a/hosts/live-env/config.nix b/hosts/live-env/config.nix index d0002a5..459e71e 100755 --- a/hosts/live-env/config.nix +++ b/hosts/live-env/config.nix @@ -3,13 +3,37 @@ let userConfig = { isNormalUser = true; - initialPassword = "1234"; + hashedPassword = "$y$j9T$OobgblSbriz8BMgqKXk8Q/$FlTKe918WI3e5m3sj0dDGO.R/rmJOqcscVZMtN5a/DD"; shell = pkgs.zsh; extraGroups = [ "wheel" ]; }; in { imports = [ ./hardware.nix ]; + boot.initrd.postDeviceCommands = lib.mkAfter '' + mkdir /btrfs_tmp + mount /dev/root_vg/root /btrfs_tmp + if [[ -e /btrfs_tmp/root ]]; then + mkdir -p /btrfs_tmp/old_roots + timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/root)" "+%Y-%m-%-d_%H:%M:%S") + mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp" + fi + + delete_subvolume_recursively() { + IFS=$'\n' + for i in $(btrfs subvolume list -o "$1" | cut -f 9- -d ' '); do + delete_subvolume_recursively "/btrfs_tmp/$i" + done + btrfs subvolume delete "$1" + } + + for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +30); do + delete_subvolume_recursively "$i" + done + + btrfs subvolume create /btrfs_tmp/root + umount /btrfs_tmp + ''; movOpts = { sysEnv = { @@ -67,7 +91,7 @@ in persistence = userConfig // { extraGroups = userConfig.extraGroups ++ [ "persist" ]; }; - root.initialPassword = "1234"; + root.hashedPassword = "$y$j9T$tjpyEif7XNctN0twWipqc/$hfVGMaVYVP7.gjqG.2eV34j2AoWp2AFBxox7B5QyQy3"; }; }; }