diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 7157ae26..ac2da64a 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -29,7 +29,7 @@ home-manager.users."${config.var.username}" = import ./home.nix; - users.users.${config.var.username}.hashedPassword = "$y$j9T$A7gH534UczuBxulj9IfEu1$ImRy3lpYpemRWNVIkA7efKPWXneFiqhZnEF1aMkWcD8"; + users.users.${config.var.username}.hashedPassword = "$y$j9T$A7gH534UczuBxulj9IfEu1$ImRy3lpYpemRWNVIkA7efKPWXneFiqhZnEF1aMkWcD8"; # CHANGEME: This is my password # Don't touch this system.stateVersion = "26.05"; diff --git a/hosts/laptop/persistence.nix b/hosts/laptop/persistence.nix index e8057132..784eea8b 100644 --- a/hosts/laptop/persistence.nix +++ b/hosts/laptop/persistence.nix @@ -1,5 +1,5 @@ # Impermanence: declares what should survive a wipe of "/". -{config, ...}: { +{ environment.persistence."/persist" = { hideMounts = true; @@ -25,14 +25,4 @@ "/var/lib/systemd/random-seed" # avoid a weak entropy pool on first boot ]; }; - - # -- How to find what's missing -- - # Use the system normally for a week or two, then look for files that - # changed recently outside of what's already declared above: - # find "/home/${config.var.username}" -xdev -type f -mtime -14 \ - # -not -path '*/.cache/*' -not -path '*/Cache/*' | less - # Anything that keeps showing up there (app state, history files, - # game saves, browser profile, spotify/lazygit config, GPG state, etc.) - # is a candidate to add above. Do this *before* switching root to a - # wipeable filesystem, not after. } diff --git a/hosts/laptop/wireguard.nix b/hosts/laptop/wireguard.nix index 9a4ebe6c..5299e618 100644 --- a/hosts/laptop/wireguard.nix +++ b/hosts/laptop/wireguard.nix @@ -5,8 +5,6 @@ }: let vpnConnection = "wg-vpn"; - # Same OSD mechanism as home/system/waybar/scripts.nix's waybar-osd: drop the - # text in /tmp/waybar-osd and nudge waybar's custom/osd module to show it. toggleVpn = pkgs.writeShellScript "toggle-wg-vpn" '' set -euo pipefail nmcli="${pkgs.networkmanager}/bin/nmcli" @@ -20,7 +18,7 @@ fi printf '%s' "$OSD_TEXT" > /tmp/waybar-osd - ${pkgs.procps}/bin/pkill -x -RTMIN+8 waybar 2>/dev/null || true + ${pkgs.procps}/bin/pkill -f -RTMIN+8 '^waybar$' 2>/dev/null || true ''; in { environment.systemPackages = [