diff --git a/hm/common.nix b/hm/common.nix index e8922ed..7d31ae7 100644 --- a/hm/common.nix +++ b/hm/common.nix @@ -506,7 +506,7 @@ in (builtins.toString ./scripts) ]; file = { - ".face" = { + ".face" = { # TODO Doesn't show on NixOS. See https://wiki.archlinux.org/title/LightDM#Changing_your_avatar ? source = pkgs.runCommand "face.png" { } "${pkgs.inkscape}/bin/inkscape ${./face.svg} -w 1024 -o $out"; }; }; diff --git a/hm/desktop.nix b/hm/desktop.nix index 4a3eb3c..68e5d91 100644 --- a/hm/desktop.nix +++ b/hm/desktop.nix @@ -37,7 +37,7 @@ in # lockColors = with config.lib.stylix.colors.withHashtag; { a = base00; b = base01; d = base00; }; # Black or White, depending on current theme # lockColors = with config.lib.stylix.colors.withHashtag; { a = base0A; b = base0B; d = base00; }; # Green + Yellow lockColors = { a = "#82a401"; b = "#466c01"; d = "#648901"; }; # Old - lockSvg = pkgs.writeText "lock.svg" ""; + lockSvg = pkgs.writeText "lock.svg" ""; lockPng = pkgs.runCommand "lock.png" { } "${pkgs.imagemagick}/bin/convert ${lockSvg} $out"; locker = pkgs.writeShellScript "i3-locker" '' @@ -48,6 +48,7 @@ in ${pkgs.lightdm}/bin/dm-tool lock # TODO Does that work for all DMs? + # TODO Might want to use i3lock on NixOS configs still? if [ $? -ne 0 ]; then if [ -d ${config.xdg.cacheHome}/lockpatterns ] then diff --git a/install_os.sh b/install_os.sh index 577e688..0091fa9 100755 --- a/install_os.sh +++ b/install_os.sh @@ -96,13 +96,6 @@ echo "{ ... }: { imports = [ ./hardware-configuration.nix ${nixos_config} ]; }" # Install NixOS! Or create a new generation. sudo nixos-install --no-root-password --root "$mountpoint" -# Install dotfiles. Actually not needed by nixos-install since it doesn't rewrite global paths to the mountpoint. -# Without it no nixos-rebuild from the system itself once installed though. -# Should probably be replaced with something like git-sync -# sudo mkdir -p $mountpoint/home/geoffrey/.config/ -# sudo cp -a ../dotfiles $mountpoint/home/geoffrey/.config/ -# sudo chown geoffrey:geoffrey $mountpoint/home/geoffrey -R - set +x # Signal the installation is done! @@ -113,3 +106,4 @@ echo "- Boot into the system" echo "- Transfer necessary private keys (or use ssh -A for testing)" echo "- Run git-sync-init" echo "- Check that the system can build itself" +echo "- Change root and user password"