Updates to get system to build

hosts/apps-desktop.nix

@@ -16,12 +16,13 @@
     protonmail-bridge
 
     # GNOME apps
-    gnome.cheese
-    gnome.nautilus
-    gnome.file-roller
-    gnome.gnome-calculator
-    gnome.gnome-disk-utility
-    gnome.simple-scan
+    cheese
+    nautilus
+    file-roller
+    gnome-calculator
+    gnome-disk-utility
+    simple-scan
+    ghex
 
     # Applications
     anki
@@ -34,7 +35,6 @@
     qbittorrent
     pureref
     libreoffice
-    gnome.ghex
     evince
     pdfsam-basic
     steam

hosts/desktop.nix

@@ -9,6 +9,11 @@ in
    xserver = {
       enable = true;
       xkb.options = "caps:escape";
+      windowManager.i3 = {
+        enable = true;
+        # Don't install dmenu, i3status, and i3lock
+        extraPackages = lib.mkOverride 0 [];
+      };
       displayManager = {
         lightdm = {
           enable = true;
@@ -18,14 +23,11 @@ in
           };
           background = theme.wallpaper;
         };
-        defaultSession = "none+i3";
-      };
-      windowManager.i3 = {
-        enable = true;
-        # Don't install dmenu, i3status, and i3lock
-        extraPackages = lib.mkOverride 0 [];
       };
     };
+    displayManager = {
+      defaultSession = "none+i3";
+    };
     udev.packages = [ pkgs.yubikey-personalization ];
     pcscd.enable = true;
     gnome.gnome-keyring.enable = true; # For remembering nextcloud login, among other things
@@ -76,15 +78,15 @@ in
   fonts = {
     enableDefaultPackages = false;
     packages = with pkgs; [
-      noto-fonts-cjk
+      noto-fonts-cjk-sans
       noto-fonts
-      (nerdfonts.override { fonts = [ "FiraCode" ]; }) # required for icons
+      nerd-fonts.fira-code # required for icons
       twitter-color-emoji
     ];
   };
 
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
-    driSupport32Bit = true; # Required for Touhou, Steam
+    enable32Bit = true; # Required for Touhou, Steam
   };
 }

hosts/desktop/hardware-configuration.nix

@@ -14,6 +14,7 @@
   hardware.enableAllFirmware = true;
   hardware.enableRedistributableFirmware = true;
   hardware.bluetooth.enable = true;
+  hardware.nvidia.open = true;
 
   fileSystems = {
     "/" = {