diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index e596e85a..954b774b 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 2026-09-19
+
+- **Fixed missing user attribute and deprecations during flake check**:
+  - Fixed evaluation failure in `platforms/nixos/modules/nmasur/presets/services/lightdm.nix` when resolving `config.home-manager.users.${username}.programs.fish.enable` by providing an `or true` fallback, accounting for home-manager removal from NixOS modules.
+  - Removed deprecated `programs.rofi.pass = { };` definition in `platforms/home-manager/modules/nmasur/presets/programs/rofi/default.nix` which caused assertion errors following the removal of `rofi-pass` in upstream home-manager and nixpkgs.
+  - Added safety fallbacks using `config.users.users.${username}.home` in `notes-git-sync` and `hammerspoon` modules when referencing user directories via `config.home-manager.users.${username}`.
+
 ## 2026-09-12
 
 - **Integrated `api` service for `flame`**:
diff --git a/platforms/home-manager/modules/nmasur/presets/programs/rofi/default.nix b/platforms/home-manager/modules/nmasur/presets/programs/rofi/default.nix
index a760f89d..fd2734ce 100644
--- a/platforms/home-manager/modules/nmasur/presets/programs/rofi/default.nix
+++ b/platforms/home-manager/modules/nmasur/presets/programs/rofi/default.nix
@@ -56,7 +56,6 @@ in
       enable = true;
       cycle = true;
       location = "center";
-      pass = { };
       terminal = lib.getExe cfg.terminal;
       plugins = [
         pkgs.rofi-calc
diff --git a/platforms/nix-darwin/modules/nmasur/presets/services/hammerspoon.nix b/platforms/nix-darwin/modules/nmasur/presets/services/hammerspoon.nix
index 2a42530a..49c5d78f 100644
--- a/platforms/nix-darwin/modules/nmasur/presets/services/hammerspoon.nix
+++ b/platforms/nix-darwin/modules/nmasur/presets/services/hammerspoon.nix
@@ -20,7 +20,7 @@ in
 
     system.activationScripts.postActivation.text = ''
       defaults write org.hammerspoon.Hammerspoon MJConfigFile "${
-        config.home-manager.users.${username}.xdg.configHome
+        config.home-manager.users.${username}.xdg.configHome or "${config.users.users.${username}.home}/.config"
       }/hammerspoon/init.lua"
       sudo killall Dock
     '';
diff --git a/platforms/nixos/modules/nmasur/presets/services/lightdm.nix b/platforms/nixos/modules/nmasur/presets/services/lightdm.nix
index 55ddf239..2a35b00a 100644
--- a/platforms/nixos/modules/nmasur/presets/services/lightdm.nix
+++ b/platforms/nixos/modules/nmasur/presets/services/lightdm.nix
@@ -30,7 +30,7 @@ in
 
   config = lib.mkIf cfg.enable {
 
-    programs.fish.enable = lib.mkIf (config.home-manager.users.${username}.programs.fish.enable) true; # Needed for LightDM to remember username
+    programs.fish.enable = lib.mkIf (config.home-manager.users.${username}.programs.fish.enable or true) true; # Needed for LightDM to remember username
 
     services.xserver = {
       enable = true;
diff --git a/platforms/nixos/modules/nmasur/presets/services/notes-git-sync.nix b/platforms/nixos/modules/nmasur/presets/services/notes-git-sync.nix
index 74f6827e..eadc9d86 100644
--- a/platforms/nixos/modules/nmasur/presets/services/notes-git-sync.nix
+++ b/platforms/nixos/modules/nmasur/presets/services/notes-git-sync.nix
@@ -28,7 +28,7 @@ in
         Type = "oneshot";
         ExecStartPre = "${lib.getExe pkgs.git} -C /data/git/notes reset --hard master";
         ExecStart = "${lib.getExe pkgs.git} -C /data/git/notes pull";
-        WorkingDirectory = config.home-manager.users.${username}.home.homeDirectory;
+        WorkingDirectory = config.home-manager.users.${username}.home.homeDirectory or config.users.users.${username}.home;
         Environment = "PATH=${pkgs.openssh}/bin";
       };
     };