update system

modules/nixos/default.nix

@@ -8,7 +8,7 @@
 
     ./fonts/fira-code.nix
     ./fonts/noto-sans.nix
-    ./fonts/nerdfonts.nix
+    ./fonts/nerd-fonts.nix
 
     ./hardware/hid-fanatecff.nix
     ./hardware/audio.nix

modules/nixos/fonts/fira-code.nix

@@ -36,11 +36,15 @@ in
 
   config = mkIf cfg.enable {
     fonts = {
-      packages = with pkgs; [ fira-code ];
-      nerdfonts.additionalFonts = [ "FiraCode" ];
+      packages =
+        with pkgs;
+        [
+          fira-code
+        ]
+        ++ (if (config.fonts.nerd-fonts.enable) then [ nerd-fonts.fira-code ] else [ ]);
       fontconfig = {
         defaultFonts.monospace = mkIf cfg.default [
-          (if (config.fonts.nerdfonts.enable) then "Fira Code Nerd Font" else "FiraCode")
+          (if (config.fonts.nerd-fonts.enable) then "Fira Code Nerd Font" else "FiraCode")
         ];
         localConf = ''
           <match target="font">

modules/nixos/fonts/nerd-fonts.nix

@@ -0,0 +1,24 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+with lib;
+
+let
+  cfg = config.fonts.nerd-fonts;
+in
+{
+  options.fonts.nerd-fonts = {
+    enable = mkEnableOption "Enable nerdfonts";
+  };
+
+  config = mkIf cfg.enable {
+    fonts = {
+      packages = with pkgs; [
+        nerd-fonts.symbols-only
+      ];
+    };
+  };
+}

modules/nixos/fonts/nerdfonts.nix

@@ -1,29 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-with lib;
-
-let
-  cfg = config.fonts.nerdfonts;
-in
-{
-  options.fonts.nerdfonts = {
-    enable = mkEnableOption "Enable nerdfonts";
-    additionalFonts = mkOption {
-      type = types.listOf types.str;
-      default = [ ];
-      description = "Additional fonts to include in the nerdfonts package";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    fonts = {
-      packages = with pkgs; [
-        (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ] ++ cfg.additionalFonts; })
-      ];
-    };
-  };
-}

modules/nixos/fonts/noto-sans.nix

@@ -21,15 +21,17 @@ in
 
   config = mkIf cfg.enable {
     fonts = {
-      packages = with pkgs; [
-        noto-fonts
-        noto-fonts-cjk-sans
-        noto-fonts-emoji
-      ];
-      nerdfonts.additionalFonts = [ "Noto" ];
+      packages =
+        with pkgs;
+        [
+          noto-fonts
+          noto-fonts-cjk-sans
+          noto-fonts-emoji
+        ]
+        ++ (if (config.fonts.nerd-fonts.enable) then [ nerd-fonts.noto ] else [ ]);
       fontconfig = {
         defaultFonts.sansSerif = mkIf cfg.default [
-          (if (config.fonts.nerdfonts.enable) then "Noto Sans Nerd Font" else "Noto Sans")
+          (if (config.fonts.nerd-fonts.enable) then "Noto Sans Nerd Font" else "Noto Sans")
         ];
       };
     };

modules/nixos/usecases/3d-printing.nix

@@ -19,7 +19,6 @@ in
     environment.systemPackages = with pkgs; [
       lpc21isp
       dfu-util
-      cura
       openscad
       bambu-studio
       (orca-slicer.overrideAttrs (

modules/nixos/usecases/gaming.nix

@@ -35,7 +35,7 @@ in
           pkgs: with pkgs; [
             libgudev
             libvdpau
-            libsoup
+            libsoup_2_4
           ];
       })
       rpcs3