fix(presets): handle missing user in lightdm and remove deprecated rofi pass

This commit is contained in:
Noah Masur
2026-09-19 15:16:00 -04:00
parent 2ac07e2874
commit c7c5a52a78
5 changed files with 10 additions and 4 deletions
+7
View File
@@ -1,5 +1,12 @@
# Changelog # 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 ## 2026-09-12
- **Integrated `api` service for `flame`**: - **Integrated `api` service for `flame`**:
@@ -56,7 +56,6 @@ in
enable = true; enable = true;
cycle = true; cycle = true;
location = "center"; location = "center";
pass = { };
terminal = lib.getExe cfg.terminal; terminal = lib.getExe cfg.terminal;
plugins = [ plugins = [
pkgs.rofi-calc pkgs.rofi-calc
@@ -20,7 +20,7 @@ in
system.activationScripts.postActivation.text = '' system.activationScripts.postActivation.text = ''
defaults write org.hammerspoon.Hammerspoon MJConfigFile "${ 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" }/hammerspoon/init.lua"
sudo killall Dock sudo killall Dock
''; '';
@@ -30,7 +30,7 @@ in
config = lib.mkIf cfg.enable { 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 = { services.xserver = {
enable = true; enable = true;
@@ -28,7 +28,7 @@ in
Type = "oneshot"; Type = "oneshot";
ExecStartPre = "${lib.getExe pkgs.git} -C /data/git/notes reset --hard master"; ExecStartPre = "${lib.getExe pkgs.git} -C /data/git/notes reset --hard master";
ExecStart = "${lib.getExe pkgs.git} -C /data/git/notes pull"; 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"; Environment = "PATH=${pkgs.openssh}/bin";
}; };
}; };