Regenerated

This commit is contained in:
2026-03-25 17:09:37 +00:00
parent ab213aaffc
commit 3f67c9e288
2 changed files with 34 additions and 18 deletions
+17 -9
View File
@@ -683,10 +683,10 @@ let
username = config.defaultUser or "henrov"; username = config.defaultUser or "henrov";
moduleName = "stylix"; moduleName = "stylix";
assetPath = "${flakeRoot}/assets/traveldroid/conf/${moduleName}"; assetPath = "${flakeRoot}/assets/traveldroid/conf/${moduleName}";
assetFiles = builtins.attrNames (builtins.readDir assetPath); assetFiles = builtins.attrNames (builtins.readDir assetPath);
# Same pattern as hyprland # Same pattern as hyprland.nix (IMPORTANT)
stylixFiles = lib.genAttrs assetFiles (f: { stylixFiles = lib.genAttrs assetFiles (f: {
name = ".config/${moduleName}/${f}"; name = ".config/${moduleName}/${f}";
value = { source = "${assetPath}/${f}"; }; value = { source = "${assetPath}/${f}"; };
@@ -728,24 +728,33 @@ in
targets = { targets = {
gtk.enable = true; gtk.enable = true;
qt.enable = true; qt.enable = true;
}; };
# Define FULL cursor set OR remove entirely
cursor = { cursor = {
name = cursorName; name = cursorName;
size = cursorSize; package = pkgs.phinger-cursors;
size = cursorSize;
};
fonts = {
monospace = {
package = pkgs.nerdfonts;
name = "JetBrainsMono Nerd Font";
};
}; };
}; };
################################# #################################
# Home Manager (safe merge) # Home Manager
################################# #################################
_module.args.hmUsers = { _module.args.hmUsers = {
"${username}" = { "${username}" = {
home.file = lib.mkMerge [ home.file = lib.mkMerge [
stylixFiles stylixFiles
{ {
"${moduleName}/stylix.conf".text = stylixConf; ".config/${moduleName}/stylix.conf".text = stylixConf;
} }
]; ];
@@ -757,8 +766,7 @@ in
HYPRCURSOR_SIZE = toString cursorSize; HYPRCURSOR_SIZE = toString cursorSize;
}; };
# Prevent GTK conflicts with your gtk.nix gtk.theme.name = lib.mkForce "Catppuccin-Mocha-Standard-Blue-Dark";
gtk.theme.name = lib.mkDefault "adw-gtk3";
}; };
}; };
} }
@@ -4,10 +4,10 @@ let
username = config.defaultUser or "henrov"; username = config.defaultUser or "henrov";
moduleName = "stylix"; moduleName = "stylix";
assetPath = "${flakeRoot}/assets/traveldroid/conf/${moduleName}"; assetPath = "${flakeRoot}/assets/traveldroid/conf/${moduleName}";
assetFiles = builtins.attrNames (builtins.readDir assetPath); assetFiles = builtins.attrNames (builtins.readDir assetPath);
# Same pattern as hyprland # Same pattern as hyprland.nix (IMPORTANT)
stylixFiles = lib.genAttrs assetFiles (f: { stylixFiles = lib.genAttrs assetFiles (f: {
name = ".config/${moduleName}/${f}"; name = ".config/${moduleName}/${f}";
value = { source = "${assetPath}/${f}"; }; value = { source = "${assetPath}/${f}"; };
@@ -49,24 +49,33 @@ in
targets = { targets = {
gtk.enable = true; gtk.enable = true;
qt.enable = true; qt.enable = true;
}; };
# Define FULL cursor set OR remove entirely
cursor = { cursor = {
name = cursorName; name = cursorName;
size = cursorSize; package = pkgs.phinger-cursors;
size = cursorSize;
};
fonts = {
monospace = {
package = pkgs.nerdfonts;
name = "JetBrainsMono Nerd Font";
};
}; };
}; };
################################# #################################
# Home Manager (safe merge) # Home Manager
################################# #################################
_module.args.hmUsers = { _module.args.hmUsers = {
"${username}" = { "${username}" = {
home.file = lib.mkMerge [ home.file = lib.mkMerge [
stylixFiles stylixFiles
{ {
"${moduleName}/stylix.conf".text = stylixConf; ".config/${moduleName}/stylix.conf".text = stylixConf;
} }
]; ];
@@ -78,8 +87,7 @@ in
HYPRCURSOR_SIZE = toString cursorSize; HYPRCURSOR_SIZE = toString cursorSize;
}; };
# Prevent GTK conflicts with your gtk.nix gtk.theme.name = lib.mkForce "Catppuccin-Mocha-Standard-Blue-Dark";
gtk.theme.name = lib.mkDefault "adw-gtk3";
}; };
}; };
} }