Merge branch '25.11'
* 25.11: Simplify aerospace launchd config and remove menu bar hiding Remove mbedtls_2 workaround for dolphin packages Re-enable packages after NixOS 25.11 upgrade Add --unsupported-gpu flag to Sway for zix790prors compatibility Fix deprecated package names for NixOS 25.11 Upgrade NixOS to 25.11 and fix Jovian module organization
This commit is contained in:
@@ -178,6 +178,7 @@ in
|
||||
|
||||
# Enable and configure aerospace
|
||||
programs.aerospace.enable = true;
|
||||
programs.aerospace.launchd.enable = cfg.launchd.enable;
|
||||
programs.aerospace.userSettings = mkMerge [
|
||||
# Default configuration with leader key substitution
|
||||
{
|
||||
@@ -306,18 +307,6 @@ in
|
||||
cfg.userSettings
|
||||
];
|
||||
|
||||
# Launchd agent for auto-starting aerospace
|
||||
launchd.agents.aerospace = mkIf cfg.launchd.enable {
|
||||
enable = true;
|
||||
config = {
|
||||
Program = "${pkgs.aerospace}/Applications/AeroSpace.app/Contents/MacOS/AeroSpace";
|
||||
RunAtLoad = true;
|
||||
KeepAlive = true;
|
||||
StandardOutPath = "/tmp/aerospace.log";
|
||||
StandardErrorPath = "/tmp/aerospace.err.log";
|
||||
};
|
||||
};
|
||||
|
||||
# Launchd agent for autoraise
|
||||
launchd.agents.autoraise = mkIf cfg.autoraise.enable {
|
||||
enable = true;
|
||||
|
||||
@@ -14,7 +14,8 @@ in
|
||||
home.packages = [
|
||||
# Communication apps
|
||||
pkgs.element-desktop
|
||||
#pkgs.fluffychat #marked insecure as of nixos 25.05
|
||||
# Re-enabled in 25.11 after security issues were resolved
|
||||
pkgs.fluffychat
|
||||
pkgs.nextcloud-talk-desktop
|
||||
|
||||
# For logging back into google chat
|
||||
|
||||
@@ -327,6 +327,7 @@ in {
|
||||
};
|
||||
in {
|
||||
enable = true;
|
||||
extraOptions = [ "--unsupported-gpu" ];
|
||||
config = recursiveUpdate base_sway_config cfg.extraSwayConfig;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user