Working on reshuffling

This commit is contained in:
2026-03-19 12:10:50 +00:00
parent fbe2b28620
commit 4b5de2fcff
2 changed files with 16 additions and 60 deletions
+8 -30
View File
@@ -976,39 +976,17 @@ Setting up GTK
** =generated/modules/desktop/fonts.nix=
This file installs and configures fonts
#+BEGIN_SRC nix :tangle generated/modules/desktop/fonts.nix :noweb tangle :mkdirp yes :eval never-html
{ lib, ... }:
{ lib, pkgs, ... }:
let
# Program-specific info
programName = "fonts";
# Enable toggle for this module (default ON)
enableProgram = true;
# Example symbolic references to fonts
fontPackages = [
"nerd-fonts.iosevka"
"nerd-fonts.fira-code"
];
in
{
# Top-level toggle
options.enableFonts = lib.mkEnableOption "Enable system fonts";
# Optional toggle for enabling fonts
options.enableFonts = lib.mkEnableOption "Enable nerd-fonts";
# Wrap everything in config.mkIf
config = lib.mkIf enableProgram {
# Inside mkIf, config is defined
myApps = let
userName = config.defaultUser or "henrov";
in
{
fonts = {
enable = true;
packages = fontPackages;
user = userName;
};
};
config = lib.mkIf (config.enableFonts or false) {
fonts.packages = with pkgs; [
nerd-fonts.iosevka
nerd-fonts.fira-code
];
};
}
#+END_SRC
+8 -30
View File
@@ -1,35 +1,13 @@
{ lib, ... }:
{ lib, pkgs, ... }:
let
# Program-specific info
programName = "fonts";
# Enable toggle for this module (default ON)
enableProgram = true;
# Example symbolic references to fonts
fontPackages = [
"nerd-fonts.iosevka"
"nerd-fonts.fira-code"
];
in
{
# Top-level toggle
options.enableFonts = lib.mkEnableOption "Enable system fonts";
# Optional toggle for enabling fonts
options.enableFonts = lib.mkEnableOption "Enable nerd-fonts";
# Wrap everything in config.mkIf
config = lib.mkIf enableProgram {
# Inside mkIf, config is defined
myApps = let
userName = config.defaultUser or "henrov";
in
{
fonts = {
enable = true;
packages = fontPackages;
user = userName;
};
};
config = lib.mkIf (config.enableFonts or false) {
fonts.packages = with pkgs; [
nerd-fonts.iosevka
nerd-fonts.fira-code
];
};
}