trimmed core/packages.nix and moved fonts to their own module

This commit is contained in:
serenity-F 2024-11-07 14:02:30 +10:00
parent e2ac25c51c
commit da0da1a6de
No known key found for this signature in database
2 changed files with 56 additions and 31 deletions

28
core/fonts.nix Normal file
View file

@ -0,0 +1,28 @@
{ 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

@ -4,6 +4,7 @@
imports = [ imports = [
#./file.nix #./file.nix
./fonts.nix
]; ];
nixpkgs = { nixpkgs = {
@ -12,10 +13,10 @@
allowUnfree = true; allowUnfree = true;
permittedInsecurePackages = [ permittedInsecurePackages = [
]; ];
allowUnsupportedSystem = true; #allowUnsupportedSystem = true;
}; };
## [START - Stolen code, no clue how it works] ## [START - Stolen code, no clue how it works :3 ]
overlays = [ overlays = [
## to use overlays exported from other flakes: ## to use overlays exported from other flakes:
#neovim-nightly-overlay.overlays.default #neovim-nightly-overlay.overlays.default
@ -45,26 +46,6 @@
config.nix.registry; config.nix.registry;
## [END - Stolen code, mostly understand from here again] ## [END - Stolen code, mostly understand from here again]
## 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" ];
};
};
};
hardware.opentabletdriver = { hardware.opentabletdriver = {
enable = true; enable = true;
#package = [ ]; #package = [ ];
@ -158,7 +139,8 @@
wayland.enable = true; wayland.enable = true;
}; };
## We switched to neovim -mostly- full-time ## Wei have switched to neovim
## full-time, sorry Micro. <3
environment.variables = { environment.variables = {
EDITOR = "neovim"; EDITOR = "neovim";
SYSTEMD_EDITOR = "neovim"; SYSTEMD_EDITOR = "neovim";
@ -171,9 +153,10 @@
## ratbagd for gaming mouse config ## ratbagd for gaming mouse config
services.ratbagd.enable = true; services.ratbagd.enable = true;
## All* system-level packages declared here ## All COMMON system-level packages declared here
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
########
## Needed for that graphical config manager, suspect that the ## Needed for that graphical config manager, suspect that the
## whole inputs.nix- yaddah yaddah is unnecessary. ## whole inputs.nix- yaddah yaddah is unnecessary.
## and look, -we- don't need a graphical config editor, but ## and look, -we- don't need a graphical config editor, but
@ -181,11 +164,20 @@
## theoretically pass off as a complete linux distribution. ## theoretically pass off as a complete linux distribution.
## So there needs to be -some- way for users who are unwilling ## So there needs to be -some- way for users who are unwilling
## to use a terminal and are more comfortable with a GUI. ## to use a terminal and are more comfortable with a GUI.
inputs.nixos-conf-editor.packages.${system}.nixos-conf-editor
#inputs.nixos-conf-editor.packages.${system}.nixos-conf-editor
#nixos-conf-editor #nixos-conf-editor
## Disabling this for now. Eats disk space, and it's useless until
## wei make a single "control" module using 'let bindings' anyway.
########
########
## Temporary desktop/user-level ## Temporary desktop/user-level
steam steam
#gitwatch
#waybar #waybar
udiskie udiskie
gparted gparted
@ -196,11 +188,18 @@
gnome-keyring gnome-keyring
polkit-kde-agent polkit-kde-agent
xorg.xhost xorg.xhost
android-tools
########
########
## Jellyfin for home media share ## Jellyfin for home media share
## Need to move this to its own module and call that to
## save the 'core' from being bloated.
#jellyfin #jellyfin
#jellyfin-web #jellyfin-web
#jellyfin-ffmpeg #jellyfin-ffmpeg
########
## Nix specific tools ## Nix specific tools
nix-tree nix-tree
@ -229,7 +228,7 @@
file file
tree tree
btop btop
micro #micro
unzip unzip
gnupg gnupg
s-tui s-tui
@ -244,8 +243,6 @@
libsecret libsecret
git-crypt git-crypt
undervolt undervolt
#gitwatch
android-tools
magic-wormhole magic-wormhole
]; ];