From 4a87f10d15414532abbebd68ade78937b6d1c3be Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 18 Aug 2024 20:50:52 -0400 Subject: [PATCH] Moving fonts --- hosts/hl-minipc1.nix | 1 + modules/home/default.nix | 3 + modules/nixos/common/core.nix | 124 +++++++++++----------------------- modules/nixos/desktop/kde.nix | 1 - modules/os/default.nix | 3 +- modules/os/fonts.nix | 23 ------- modules/skyg/default.nix | 1 + 7 files changed, 46 insertions(+), 110 deletions(-) delete mode 100644 modules/os/fonts.nix diff --git a/hosts/hl-minipc1.nix b/hosts/hl-minipc1.nix index 6c77f62..2237f7e 100644 --- a/hosts/hl-minipc1.nix +++ b/hosts/hl-minipc1.nix @@ -7,6 +7,7 @@ services.nix-serve = { enable = true; secretKeyFile = "/var/keys/cache-priv-key.pem"; + port = 5000; }; # firmware updater services.fwupd.enable = true; diff --git a/modules/home/default.nix b/modules/home/default.nix index 21ace1b..7fc25cf 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -3,6 +3,7 @@ let makeCommonGitConfigs = (import ./git.nix).makeCommonGitConfigs; programsModule = (import ./programs.nix); servicesModule = (import ./services.nix); + fontsModule = (import ./fonts.nix); homeModule = { stateVersion = stateVersion; shellAliases = { @@ -21,6 +22,7 @@ in }); }; services = servicesModule { pkgs = pkgs; }; + fonts = fontsModule; }; makeCommonUser = @@ -31,6 +33,7 @@ in , name , ... }: { pkgs, ... }: { + fonts = fontsModule; home = homeModule // { username = name; homeDirectory = "/home/${name}"; diff --git a/modules/nixos/common/core.nix b/modules/nixos/common/core.nix index 863ce65..6cfa3ee 100644 --- a/modules/nixos/common/core.nix +++ b/modules/nixos/common/core.nix @@ -1,87 +1,43 @@ -# { config, lib, pkgs, ... }: -# with lib; - -# let -# in -# { -# options = { -# skyg.desktop.kde = { -# enabled = mkEnableOption -# "KDE"; -# }; -# }; -# config = mkIf cfg.enabled { -# services.desktopManager.plasma6.enable = true; -# services.desktopManager.plasma6.notoPackage = config.skyg.desktop.fonts; -# services.desktopManager.plasma6.enableQt5Integration = true; -# environment.plasma6.excludePackages = with pkgs.kdePackages; [ -# konsole # terminal -# elisa # media player -# kate # text editor -# gwenview # image viewer -# ]; -# environment.systemPackages = with pkgs; [ -# kdePackages.plasma-browser-integration -# konsave # save configs -# ]; -# }; -# } - -{ pkgs, config, lib, ... }: -let - cfg = config.skyg.nixos; - defaultConfig = { - # System Packages - services.hydra.useSubstitutes = true; - programs.dconf.enable = true; - programs.nix-ld.enable = true; - environment.systemPackages = with pkgs; [ - # nix utils - appimage-run - - # shell tools - git - usbutils - - # system utils - nfs-utils - - # misc - glib-networking - glib - glibc - - # printer - system-config-printer - ]; - services.xserver.excludePackages = with pkgs; [ - xterm - ]; - # Set your time zone. - time.timeZone = "America/Toronto"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_CA.UTF-8"; - - # Storage Clean up - services.cron = { - enable = true; - systemCronJobs = [ - "* 23 * * * root nix-collect-garbage --delete-older-than 1d" - "* 23 * * * ${config.skyg.user.name} nix-collect-garbage --delete-older-than 1d" - ]; - }; - }; -in +{ pkgs, config, ... }: { - options = { - skyg.nixos.enableServe = lib.mkEnableOption "Enable nix serve"; - }; + # System Packages + services.hydra.useSubstitutes = true; + programs.dconf.enable = true; + programs.nix-ld.enable = true; + environment.systemPackages = with pkgs; [ + # nix utils + appimage-run - config = defaultConfig // (if cfg.enableServe then { - services.nix-serve = { - enable = true; - port = 5000; - }; - } else { }); + # shell tools + git + usbutils + + # system utils + nfs-utils + + # misc + glib-networking + glib + glibc + + # printer + system-config-printer + ]; + services.xserver.excludePackages = with pkgs; [ + xterm + ]; + # Set your time zone. + time.timeZone = "America/Toronto"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_CA.UTF-8"; + + # Storage Clean up + services.cron = { + enable = true; + systemCronJobs = [ + "* 23 * * * root nix-collect-garbage --delete-older-than 1d" + "* 23 * * * ${config.skyg.user.name} nix-collect-garbage --delete-older-than 1d" + ]; + }; } diff --git a/modules/nixos/desktop/kde.nix b/modules/nixos/desktop/kde.nix index a2fd915..43837d8 100644 --- a/modules/nixos/desktop/kde.nix +++ b/modules/nixos/desktop/kde.nix @@ -13,7 +13,6 @@ in }; config = mkIf cfg.enabled { services.desktopManager.plasma6.enable = true; - services.desktopManager.plasma6.notoPackage = config.skyg.desktop.fonts; services.desktopManager.plasma6.enableQt5Integration = true; environment.plasma6.excludePackages = with pkgs.kdePackages; [ konsole # terminal diff --git a/modules/os/default.nix b/modules/os/default.nix index db21d0e..64390ad 100644 --- a/modules/os/default.nix +++ b/modules/os/default.nix @@ -15,8 +15,7 @@ (import ./containers/default.nix ({ user = user; } // containers)) - ] ++ (if enableFonts then [ ./fonts.nix ] else [ ]) - ++ (if hardware.enable then [ ./hardware.nix ] else [ ]) + ] ++ (if hardware.enable then [ ./hardware.nix ] else [ ]) ++ (if enableNetworking then [ (import ./networking.nix { diff --git a/modules/os/fonts.nix b/modules/os/fonts.nix deleted file mode 100644 index fb558d5..0000000 --- a/modules/os/fonts.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ pkgs, ... }: -{ - # Fonts - fonts = { - packages = with pkgs; [ - fira-code - fira-code-symbols - font-awesome - mplus-outline-fonts.githubRelease - noto-fonts-emoji - ]; - enableDefaultPackages = true; - fontDir.enable = true; - fontconfig = { - enable = true; - defaultFonts = { - serif = [ "Fira Code" "DroidSansMono" ]; - sansSerif = [ "Fira Code" "DroidSansMono" ]; - monospace = [ "Fira Code" ]; - }; - }; - }; -} diff --git a/modules/skyg/default.nix b/modules/skyg/default.nix index 7c5c34e..c2bb296 100644 --- a/modules/skyg/default.nix +++ b/modules/skyg/default.nix @@ -4,6 +4,7 @@ ./core.nix ./user.nix ./macos.nix + ./fonts.nix ./nix-substituters.nix ]; }