moved core/fonts.nix into core/display.nix

This commit is contained in:
serenity-F 2024-11-16 08:35:54 +10:00
parent c64b7d7d68
commit c43d7b2add
No known key found for this signature in database
3 changed files with 22 additions and 45 deletions

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}:
{ inputs, outputs, lib, config, pkgs, ... }:
{
imports = [
@ -101,4 +94,23 @@
#];
#};
## I put fonts here because i didn't know where tf else to put them lol
## CURRENTLY BROKEN, PLEASE FIX - Out of date ?
fonts = {
packages = with pkgs; [
spleen
terminus_font
terminus_font_ttf
(nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; })
];
fontDir.enable = true;
fontconfig = {
defaultFonts = {
serif = [ "spleen-32x64" ];
sansSerif = [ "spleen-32x64" ];
monospace = [ "TerminusTTF" ];
};
};
};
}

View file

@ -1,28 +0,0 @@
{ inputs, outputs, lib, config, pkgs, ... }:
{
imports = [
#./file.nix
];
## I put fonts here because i didn't know where tf else to put them lol
## CURRENTLY BROKEN - PLEASE FIX
fonts = {
packages = with pkgs; [
spleen
terminus_font
terminus_font_ttf
(nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; })
];
fontDir.enable = true;
fontconfig = {
defaultFonts = {
serif = [ "spleen-32x64" ];
sansSerif = [ "spleen-32x64" ];
monospace = [ "TerminusTTF" ];
};
};
};
}

View file

@ -3,16 +3,16 @@
{
imports = [
./fonts.nix
#./file.nix
];
nixpkgs = {
config = {
allowUnfree = true;
## Place insecure packages here
permittedInsecurePackages = [
];
#allowUnsupportedSystem = true;
};
## [START - Stolen code, no clue how it works :3 ]
@ -45,13 +45,6 @@
config.nix.registry;
## [END - Stolen code, mostly understand from here again]
hardware.opentabletdriver = {
enable = true;
#package = [ ];
#daemon.enable = true;
#blacklistedKernelModules = [ ];
};
environment.sessionVariables = rec {
XDG_CACHE_HOME = "$HOME/.cache";
XDG_CONFIG_HOME = "$HOME/.config";