Migrate from PAM text to structured rules This fixes breakage caused by https://github.com/NixOS/nixpkgs/pull/420889 Also reformat some stuff and fix typos

Changes

5 changed files (+19/-12)

• Framework-13/default.nix
  • @@ -24,7 +24,7 @@
    # Fingerprint authentication services.fprintd.enable = true; - # Don't enable fprintd for everything, otherwise SDDM takes 30 seconds to log in + # Don't enable fprintd for everything, otherwise plasmalogin takes 30 seconds to log in # Also, pam_kwallet5.so needs my password which obviously doesn't work with fingerprint login # https://github.com/NixOS/nixpkgs/issues/239770#issuecomment-1868402338 security.pam.services.login.fprintAuth = false;
• Unnamed-Server/default.nix
  • @@ -129,7 +129,7 @@
    "git.unnamed.website".extraConfig = '' handle /robots.txt { respond "User-agent: * - Disallow: /" + Disallow: /" } # Block scrapers but allow Git clones @notgit {
• configuration.nix
  • @@ -50,7 +50,6 @@
    # Am I really that normal? isNormalUser = true; extraGroups = [ "wheel" ]; - description = "Anthony Wang"; # I can't bash you know shell = pkgs.fish; initialPassword = "change asap";
• flake.lock
  • @@ -23,11 +23,11 @@
    }, "nixpkgs": { "locked": { - "lastModified": 1776169885, - "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", + "lastModified": 1776548001, + "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", + "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", "type": "github" }, "original": {
• laptop.nix
  • @@ -181,12 +181,20 @@
    # Give PLM permission to read LUKS password for autologin systemd.services.plasmalogin.serviceConfig.KeyringMode = "inherit"; # PAM is evil dark magic - # The default /etc/pam.d/plasmalogin-autologin doesn't invoke auth pam_kwallet5.so - # Thus we need to manually do it with auth include sddm - security.pam.services.plasmalogin-autologin.text = pkgs.lib.mkBefore '' - auth optional ${pkgs.systemd}/lib/security/pam_systemd_loadkey.so - auth include plasmalogin - ''; + security.pam.services.plasmalogin-autologin.rules.auth = { + systemd_loadkey = { + order = 0; + control = "optional"; + modulePath = "${pkgs.systemd}/lib/security/pam_systemd_loadkey.so"; + }; + # The default /etc/pam.d/plasmalogin-autologin doesn't invoke pam_kwallet5.so + # Thus we need to manually do it with auth include plasmalogin + plasmalogin = { + order = 1; + control = "include"; + modulePath = "plasmalogin"; + }; + }; # My hardware is pretty well supported wow what a surprise services.fwupd.enable = true;