From 93bb0c3f3aa5aaa1d639b4fbe1641615ba97bd90 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Mon, 11 Nov 2024 15:12:44 -0500 Subject: [PATCH] latest --- hosts/hl-bigbox1.nix | 8 ++++++-- modules/nixos/common/fonts.nix | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index 5dfb0fd..ae21b31 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -1,4 +1,8 @@ +<<<<<<< HEAD +{user}: +======= {}: +>>>>>>> main { pkgs, config, ... }: { imports = [ ./hl-bigbox1.hardware-configuration.nix ]; @@ -6,8 +10,8 @@ skyg.nixos.common.ssh-server.enable = true; skyg.nixos.server.services.ai.enable = true; skyg.nixos.server.services.jellyfin.enable = true; - skyg.nixos.desktop.kde.enabled = true; - skyg.nixos.desktop.enabled = false; + skyg.nixos.desktop.kde.enable = true; + skyg.nixos.desktop.enable = false; skyg.server.admin.enable = true; users.users.ari.extraGroups = [ "input" ]; # firmware updater diff --git a/modules/nixos/common/fonts.nix b/modules/nixos/common/fonts.nix index 8f2807c..f0c036e 100644 --- a/modules/nixos/common/fonts.nix +++ b/modules/nixos/common/fonts.nix @@ -9,7 +9,7 @@ jetbrains-mono ubuntu_font_family noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji ]; enableDefaultPackages = true;