Moving fonts
This commit is contained in:
1 parent
93d31e99b0
commit
4a87f10d15
7 files changed
+46
-110
No files matched your search
@@ -7,6 +7,7 @@
|
||||
services.nix-serve = {
|
||||
enable = true;
|
||||
secretKeyFile = "/var/keys/cache-priv-key.pem";
|
||||
port = 5000;
|
||||
};
|
||||
# firmware updater
|
||||
services.fwupd.enable = true;
|
||||
|
||||
@@ -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}";
|
||||
|
||||
@@ -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"
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -4,6 +4,7 @@
|
||||
./core.nix
|
||||
./user.nix
|
||||
./macos.nix
|
||||
./fonts.nix
|
||||
./nix-substituters.nix
|
||||
];
|
||||
}
|
||||
Reference in new issue
Block a user