Fix noctalia config interfering with stylix
This commit is contained in:
@@ -4,7 +4,15 @@
|
|||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: {
|
}: let
|
||||||
|
# Apply lib.mkDefault to a whole attrset recursively, used for the noctalia config
|
||||||
|
mkDefaultsRec = value:
|
||||||
|
if builtins.isAttrs value
|
||||||
|
then lib.mapAttrs (_: mkDefaultsRec) value
|
||||||
|
else if builtins.isList value
|
||||||
|
then map mkDefaultsRec value
|
||||||
|
else lib.mkDefault value;
|
||||||
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
# inputs.hyprland.homeManagerModules.default
|
# inputs.hyprland.homeManagerModules.default
|
||||||
# ./waybar
|
# ./waybar
|
||||||
@@ -37,7 +45,8 @@
|
|||||||
programs.noctalia-shell = {
|
programs.noctalia-shell = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# noctalia-shell ipc call state all | jq .settings | xclip
|
# noctalia-shell ipc call state all | jq .settings | xclip
|
||||||
settings = lib.mkDefault (builtins.fromJSON (builtins.readFile ./noctalia.json));
|
# mkDefaultsRec used so that stylix can overwrite style options
|
||||||
|
settings = mkDefaultsRec (builtins.fromJSON (builtins.readFile ./noctalia.json));
|
||||||
};
|
};
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
|
|||||||
Reference in New Issue
Block a user