migrate dustin from petalburg to rustboro

This commit is contained in:
Aly Raffauf 2024-04-03 15:18:49 -04:00
parent 98ea87a8b6
commit e65f0e95bb
4 changed files with 61 additions and 51 deletions

View file

@ -77,8 +77,7 @@ in {
desktopConfig = {
enable = true;
windowManagers.hyprland.enable = false;
desktopEnvironments.gnome.enable = true;
windowManagers.hyprland.enable = true;
};
systemConfig = {

View file

@ -12,16 +12,13 @@
desktopEnv.hyprland.enable = true;
};
userConfig.dustin.enable = true;
home-manager.users.dustin = {
imports = [ ../../homeManagerModules ];
home.username = "dustin";
home.homeDirectory = "/home/dustin";
# userConfig.dustin.enable = true;
# home-manager.users.dustin = {
# imports = [ ../../homeManagerModules ];
# home.username = "dustin";
# home.homeDirectory = "/home/dustin";
home.stateVersion = "23.11";
programs.home-manager.enable = true;
desktopEnv.hyprland.enable = false;
desktopEnv.gnome.enable = true;
};
# home.stateVersion = "23.11";
# programs.home-manager.enable = true;
# };
}

View file

@ -13,32 +13,32 @@
# Bootloader.
loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true;
initrd.postDeviceCommands = lib.mkAfter ''
mkdir /btrfs_tmp
mount /dev/sda2 /btrfs_tmp
if [[ -e /btrfs_tmp/rootfs ]]; then
mkdir -p /btrfs_tmp/old_roots
timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/rootfs)" "+%Y-%m-%-d_%H:%M:%S")
mv /btrfs_tmp/rootfs "/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 +5); do
delete_subvolume_recursively "$i"
done
btrfs subvolume create /btrfs_tmp/rootfs
umount /btrfs_tmp
'';
};
# initrd.postDeviceCommands = lib.mkAfter ''
# mkdir /btrfs_tmp
# mount /dev/sda2 /btrfs_tmp
# if [[ -e /btrfs_tmp/rootfs ]]; then
# mkdir -p /btrfs_tmp/old_roots
# timestamp=$(date --date="@$(stat -c %Y /btrfs_tmp/rootfs)" "+%Y-%m-%-d_%H:%M:%S")
# mv /btrfs_tmp/rootfs "/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 +5); do
# delete_subvolume_recursively "$i"
# done
# btrfs subvolume create /btrfs_tmp/rootfs
# umount /btrfs_tmp
# '';
# };
networking.hostName = "rustboro"; # Define your hostname.
@ -62,19 +62,16 @@
steam.enable = false;
};
users.users.aly.hashedPassword =
"$y$j9T$VdtiEyMOegHpcUwgmCVFD0$K8Ne6.zk//VJNq2zxVQ0xE0Wg3LohvAQd3Xm9aXdM15";
environment.persistence."/persist" = {
hideMounts = true;
directories = [
"/etc/NetworkManager/system-connections"
"/etc/ssh"
];
files = [
"/etc/machine-id"
];
};
# environment.persistence."/persist" = {
# hideMounts = true;
# directories = [
# "/etc/NetworkManager/system-connections"
# "/etc/ssh"
# ];
# files = [
# "/etc/machine-id"
# ];
# };
system.stateVersion = "23.11"; # Did you read the comment?
}

View file

@ -1,6 +1,23 @@
{ inputs, config, pkgs, lib, ... }:
{
userConfig.dustin.enable = true;
users.users.dustin.hashedPassword =
"$y$j9T$OXQYhj4IWjRJWWYsSwcqf.$lCcdq9S7m0EAdej9KMHWj9flH8K2pUb2gitNhLTlLG/";
home-manager.users.dustin = {
imports = [ ../../homeManagerModules ];
home.username = "dustin";
home.homeDirectory = "/home/dustin";
home.stateVersion = "23.11";
programs.home-manager.enable = true;
};
users.users.aly.hashedPassword =
"$y$j9T$VdtiEyMOegHpcUwgmCVFD0$K8Ne6.zk//VJNq2zxVQ0xE0Wg3LohvAQd3Xm9aXdM15";
home-manager.users.aly = {
imports = [ ../../homeManagerModules ];
home.username = "aly";