Fixed font configuration

This commit is contained in:
2025-03-27 14:26:20 +00:00
parent d3e5d8aa89
commit 190bae5036
5 changed files with 17 additions and 49 deletions

View File

@@ -6,18 +6,11 @@
pkgs, pkgs,
unstablePkgs, unstablePkgs,
... ...
}: let }: {
monaspaceFont = pkgs.callPackage ../../modules/monaspice_font.nix {};
in {
home.file = { home.file = {
".bashrc" = lib.mkIf (!config.programs.bash.enable) { ".bashrc" = lib.mkIf (!config.programs.bash.enable) {
source = ./dotfiles/dot_bashrc; source = ./dotfiles/dot_bashrc;
}; };
"monaspice" = {
source = "${monaspaceFont}/share/fonts/";
target = ".local/share/fonts/";
recursive = true;
};
"nushell" = { "nushell" = {
source = ./dotfiles/dot_config/nushell; source = ./dotfiles/dot_config/nushell;
target = ".config/nushell"; target = ".config/nushell";

View File

@@ -6,9 +6,7 @@
pkgs, pkgs,
unstablePkgs, unstablePkgs,
... ...
}: let }: {
monaspaceFont = pkgs.callPackage ../../modules/monaspice_font.nix {};
in {
home.packages = home.packages =
(with pkgs; [ (with pkgs; [
alejandra alejandra
@@ -22,8 +20,5 @@ in {
lazygit lazygit
nixd nixd
nushell nushell
]) ]);
++ [
monaspaceFont
];
} }

View File

@@ -1,22 +0,0 @@
{
stdenv,
pkgs,
}:
stdenv.mkDerivation {
name = "monaspace-nerd-font";
src = pkgs.fetchurl {
url = "https://github.com/ryanoasis/nerd-fonts/releases/latest/download/Monaspace.tar.xz";
sha256 = "sha256-+uuQeCeioHrmTI+hpcpIzZ5gyQhKJMSNd5owz2vQaTo=";
};
unpackPhase = ''
mkdir -p $out/share/fonts/
chmod +rw $out/share/fonts/
tar -xf $src -C $out/share/fonts/
'';
installPhase = ''
find $out/share/fonts -name '*.ttf' -exec mv {} $out/share/fonts/truetype/ \;
find $out/share/fonts -name '*.otf' -exec mv {} $out/share/fonts/opentype/ \;
'';
}

View File

@@ -165,8 +165,6 @@
xcp xcp
zellij zellij
zoxide zoxide
monaspace
nerdfonts
brotli brotli
gcc gcc
gnumake gnumake
@@ -263,5 +261,8 @@
enableDefaultPackages = true; enableDefaultPackages = true;
fontDir.enable = true; fontDir.enable = true;
fontconfig.defaultFonts.monospace = ["MonaspiceArNerdFontMono"]; fontconfig.defaultFonts.monospace = ["MonaspiceArNerdFontMono"];
packages = with pkgs; [
nerdfonts
];
}; };
} }

View File

@@ -23,20 +23,21 @@
monospace = ["MonaspiceArNerdFontMono"]; monospace = ["MonaspiceArNerdFontMono"];
}; };
}; };
packages = with pkgs; [
corefonts
liberation_ttf
nerdfonts
nerd-font-patcher
noto-fonts
noto-fonts-color-emoji
vistafonts
winePackages.fonts
];
}; };
# Theming packages # Theming packages
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# fonts
corefonts
liberation_ttf
monaspace
nerdfonts
nerd-font-patcher
noto-fonts
noto-fonts-color-emoji
vistafonts
winePackages.fonts
# Cursor # Cursor
hyprcursor hyprcursor
# QT # QT