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