Fix installation bugs

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
This commit is contained in:
2024-12-04 21:11:08 +00:00
parent 41b75cad1e
commit ffbde1430c
4 changed files with 12 additions and 5 deletions

View File

@@ -1,3 +1,4 @@
[[ ! -d "${CONFIG}" ]] && mkdir -p "${CONFIG}"
[[ ! -L "${CONFIG}"/wallpaper ]] && ln -sf "${DEFAULT_WALLPAPER}" "${CONFIG}"/wallpaper [[ ! -L "${CONFIG}"/wallpaper ]] && ln -sf "${DEFAULT_WALLPAPER}" "${CONFIG}"/wallpaper
[[ ! -f "${CONFIG}"/mode ]] && echo "${DEFAULT_MODE}" > "${CONFIG}"/mode [[ ! -f "${CONFIG}"/mode ]] && echo "${DEFAULT_MODE}" > "${CONFIG}"/mode

View File

@@ -1,4 +1,4 @@
{ config, ... }: { config, lib, ... }:
let let
# FIXME: https://github.com/NixOS/nixpkgs/issues/24570 # FIXME: https://github.com/NixOS/nixpkgs/issues/24570
# FIXME: https://github.com/NixOS/nixpkgs/issues/305643 # FIXME: https://github.com/NixOS/nixpkgs/issues/305643
@@ -80,7 +80,7 @@ in
hashedPasswordFile = config.sops.secrets."${user}-password".path; hashedPasswordFile = config.sops.secrets."${user}-password".path;
extraGroups = [ "wheel" ]; extraGroups = [ "wheel" ];
linger = true; linger = true;
uid = 1000; uid = lib.strings.toInt (builtins.readFile ../../../users/${user}/uid);
}; };
services.getty.autologinUser = user; services.getty.autologinUser = user;

View File

@@ -56,7 +56,7 @@ setup_wifi() {
select_host() { select_host() {
echo "Available hosts:" echo "Available hosts:"
echo $(nix flake show --json | nix shell nixpkgs#jq --command jq -r '.nixosConfigurations | keys[]') echo $(nix --experimental-features "nix-command flakes" flake show --json | nix --experimental-features "nix-command flakes" shell nixpkgs#jq --command jq -r '.nixosConfigurations | keys[]')
echo "Enter host:" echo "Enter host:"
read -r host read -r host
@@ -81,8 +81,13 @@ copy_keys() {
cp "./hosts/${host}/secrets/ssh_host_ed25519_key" /mnt/persist/etc/ssh/ssh_host_ed25519_key cp "./hosts/${host}/secrets/ssh_host_ed25519_key" /mnt/persist/etc/ssh/ssh_host_ed25519_key
for user in "${users[@]}"; do for user in "${users[@]}"; do
mkdir -p "/mnt/persist/home/${user}/.local/share/sops-nix" mkdir -p "/mnt/persist/home/${user}/.config/sops-nix"
cp "./users/${user}/secrets/key.txt" "/mnt/persist/home/${user}/.local/share/sops-nix/key.txt" cp "./users/${user}/secrets/key.txt" "/mnt/persist/home/${user}/.config/sops-nix/key.txt"
uid=$(cat "./users/${user}/uid")
gid=100
chown -R "${uid}:${gid}" "/mnt/persist/home/${user}"
done done
} }

1
users/nick/uid Normal file
View File

@@ -0,0 +1 @@
1000