feat: update inputs and move to noctalia v5

This commit is contained in:
2026-06-23 19:27:26 +02:00
parent 55cc17abb4
commit 9533485f35
6 changed files with 254 additions and 731 deletions
+10 -40
View File
@@ -5,53 +5,31 @@
}:
let
mkNoctaliaSettings =
{
homeDirectory,
lib,
terminalCommand,
}:
{ homeDirectory }:
import ./_noctalia-config.nix {
inherit
homeDirectory
lib
terminalCommand
;
inherit homeDirectory;
};
mkBaseSettings =
{
homeDirectory,
lib,
terminalCommand,
}:
{ homeDirectory }:
mkNoctaliaSettings {
inherit
homeDirectory
lib
terminalCommand
;
inherit homeDirectory;
};
mkPortableSettings =
baseSettings:
lib.recursiveUpdate baseSettings {
bar.widgets.right = lib.concatMap (
bar.default.end = lib.concatMap (
widget:
if widget.id == "ControlCenter" then
if widget == "control-center" then
[
{
id = "Network";
}
{
id = "Battery";
showPowerProfiles = true;
displayMode = "graphic";
}
"network"
"battery"
widget
]
else
[ widget ]
) baseSettings.bar.widgets.right;
) baseSettings.bar.default.end;
};
in
{
@@ -61,14 +39,11 @@ in
inputs,
lib,
osConfig,
pkgs,
...
}:
let
baseSettings = mkBaseSettings {
inherit lib;
homeDirectory = config.home.homeDirectory;
terminalCommand = lib.getExe pkgs.xdg-terminal-exec;
};
settings =
if baseSettings == { } || !(osConfig.facts.machine.portable or false) then
@@ -79,13 +54,8 @@ in
{
imports = [ inputs.noctalia.homeModules.default ];
programs.noctalia-shell = {
programs.noctalia = {
enable = true;
package = lib.mkForce (
inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default.override {
calendarSupport = true;
}
);
inherit settings;
};
};