Don't use stylix for fonts

This commit is contained in:
Henry Hiles 2025-07-09 20:20:52 -04:00
parent 4a53253800
commit 277f6a3f79
No known key found for this signature in database
7 changed files with 21 additions and 51 deletions

View file

@ -82,11 +82,9 @@
++ opt isDesktop ( ++ opt isDesktop (
(dirFiles ".nix" ./modules/desktop) (dirFiles ".nix" ./modules/desktop)
++ [ ++ [
inputs.home-manager.nixosModules.home-manager
inputs.stylix.nixosModules.stylix inputs.stylix.nixosModules.stylix
./stylix.nix ./stylix.nix
inputs.home-manager.nixosModules.home-manager
./home-manager.nix
] ]
); );
}; };

View file

@ -1,10 +0,0 @@
{pkgs, ...}: {
gtk = {
enable = true;
iconTheme = {
name = "Papirus";
package = pkgs.papirus-icon-theme;
};
};
}

View file

@ -116,9 +116,9 @@
font-hinting = "slight"; font-hinting = "slight";
font-antialiasing = "grayscale"; font-antialiasing = "grayscale";
font-name = "Cantarell 11"; font-name = "sans";
document-font-name = font-name; document-font-name = font-name;
monospace-font-name = "FiraCode Nerd Font 11"; monospace-font-name = "monospace";
}; };
# "org/gnome/Ptyxis".default-profile-uuid = "quadradical"; # "org/gnome/Ptyxis".default-profile-uuid = "quadradical";

View file

@ -1,8 +1,5 @@
{ {
environment.sessionVariables = { environment.sessionVariables.NIXOS_OZONE_WL = "1";
NIXOS_OZONE_WL = "1";
GTK_USE_PORTAL = "1";
};
services = { services = {
desktopManager.gnome.enable = true; desktopManager.gnome.enable = true;

12
modules/desktop/fonts.nix Normal file
View file

@ -0,0 +1,12 @@
{pkgs, ...}: {
fonts = {
enableDefaultPackages = false;
packages = with pkgs; [inter nerd-fonts.fira-code twitter-color-emoji];
fontconfig.defaultFonts = rec {
serif = ["Inter"];
sansSerif = serif;
monospace = ["FiraCode Nerd Font"];
emoji = ["Twitter Color Emoji"];
};
};
}

View file

@ -16,9 +16,11 @@
resources resources
libreoffice libreoffice
wl-clipboard wl-clipboard
google-cursor
prismlauncher prismlauncher
authenticator authenticator
cinny-desktop cinny-desktop
papirus-icon-theme
nexusmods-app-unfree nexusmods-app-unfree
hunspellDicts.en_CA-large hunspellDicts.en_CA-large
]; ];

View file

@ -5,38 +5,9 @@
image = ./background.jpg; image = ./background.jpg;
enableReleaseChecks = false; enableReleaseChecks = false;
base16Scheme = "${pkgs.base16-schemes}/share/themes/nord.yaml"; base16Scheme = "${pkgs.base16-schemes}/share/themes/nord.yaml";
targets = {
cursor = { fontconfig.enable = false;
name = "GoogleDot-Blue"; font-packages.enable = false;
package = pkgs.google-cursor;
size = 24;
};
fonts = {
serif = {
name = "Cantarell";
package = pkgs.cantarell-fonts;
};
sansSerif = {
name = "Cantarell";
package = pkgs.cantarell-fonts;
};
monospace = {
name = "FiraCode Nerd Font";
package = pkgs.nerd-fonts.fira-code;
};
emoji = {
name = "Twitter Color Emoji";
package = pkgs.twitter-color-emoji;
};
sizes = {
applications = 11;
desktop = 11;
};
}; };
}; };
} }