From 5c0196c3f713cf8c0d910e918f37ae61e614b870 Mon Sep 17 00:00:00 2001
From: alex <reizero@live.com>
Date: Mon, 21 Apr 2025 23:05:03 +0800
Subject: [PATCH] fix issue

---
 home/core.nix                   | 1 +
 modules/nixos/core/system.nix   | 2 --
 modules/nixos/fonts/default.nix | 2 +-
 modules/nixos/nvidia.nix        | 2 +-
 profiles/apollo/hardware.nix    | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/home/core.nix b/home/core.nix
index d94f77b..c1ff91e 100644
--- a/home/core.nix
+++ b/home/core.nix
@@ -78,6 +78,7 @@
 
     vim = {
       enable = true;
+      defaultEditor = true;
       plugins = with pkgs.vimPlugins; [ vim-airline ];
       settings = { ignorecase = true; };
       extraConfig = ''
diff --git a/modules/nixos/core/system.nix b/modules/nixos/core/system.nix
index a0831e8..db9322c 100644
--- a/modules/nixos/core/system.nix
+++ b/modules/nixos/core/system.nix
@@ -27,12 +27,10 @@
       experimental-features = "nix-command flakes";
       substituters = [
         "https://mirrors.ustc.edu.cn/nix-channels/store"
-        "https://nixos-cn.cachix.org"
         "https://nix-community.cachix.org"
         "https://cache.nixos.org/"
       ];
       trusted-public-keys = [
-        "nixos-cn.cachix.org-1:L0jEaL6w7kwQOPlLoCR3ADx+E3Q8SEFEcB9Jaibl0Xg="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       ];
       trusted-users = [ "root" ];
diff --git a/modules/nixos/fonts/default.nix b/modules/nixos/fonts/default.nix
index 52f9679..3d6c663 100644
--- a/modules/nixos/fonts/default.nix
+++ b/modules/nixos/fonts/default.nix
@@ -11,7 +11,7 @@
   # all fonts are linked to /nix/var/nix/profiles/system/sw/share/X11/fonts
   fonts = {
     # use fonts specified by user rather than default ones
-    enableDefaultFonts = false;
+    enableDefaultPackages = false;
     fontDir.enable = true;
 
     packages = with pkgs; [
diff --git a/modules/nixos/nvidia.nix b/modules/nixos/nvidia.nix
index d404971..3cf35f9 100644
--- a/modules/nixos/nvidia.nix
+++ b/modules/nixos/nvidia.nix
@@ -1,7 +1,7 @@
 {config, ...}:
 {
 # Make sure opengl is enabled
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
     driSupport = true;
     driSupport32Bit = true;
diff --git a/profiles/apollo/hardware.nix b/profiles/apollo/hardware.nix
index 80294f8..52e9108 100644
--- a/profiles/apollo/hardware.nix
+++ b/profiles/apollo/hardware.nix
@@ -4,7 +4,7 @@
 { config, lib, pkgs, modulesPath, username, ... }:
 
 {
-   hardware.opengl = {
+   hardware.graphics = {
     enable = true;
     extraPackages = with pkgs; [
       vaapiIntel