updates

hosts/_common/components/gnome_wayland.nix

@@ -11,7 +11,7 @@
   };
   services.gnome.core-utilities.enable = false;
   environment.systemPackages = with pkgs; [
-    gnome.dconf-editor
+    dconf-editor
     # wayland clipboard in terminal
     wl-clipboard
   ];

hosts/_common/components/ssh.nix

@@ -13,7 +13,9 @@
   # Enable the OpenSSH daemon.
   services.openssh = {
     enable = true;
-    logLevel = "VERBOSE";
-    settings.PermitRootLogin = "yes";
+    settings = {
+      LogLevel = "VERBOSE";
+      PermitRootLogin = "yes";
+    };
   };
 }

hosts/_common/configuration.nix

@@ -78,7 +78,7 @@ in
     lsof
 
     # TODO keep in common or move to specific machines, I want this for my pocket 3 video KDM module but I use ffmpeg on most machines anyways?
-    ffmpeg_5-full
+    ffmpeg-full
   ];
 
   environment.shellAliases = {

hosts/gpdPocket3/configuration.nix

@@ -79,10 +79,9 @@
     "thunderbolt"
   ];
   services.xserver.videoDrivers = [ "intel" ];
-  hardware.opengl = {
-    enable = true;
-    driSupport = true;
-  };
+  hardware.opengl.driSupport32Bit = true;
+  hardware.graphics.enable = true;
+
   hardware.opengl.extraPackages = with pkgs; [
     intel-media-driver
     intel-vaapi-driver

hosts/h002/configuration.nix

@@ -1,10 +1,8 @@
 {
-  config,
-  lib,
   pkgs,
   settings,
   ...
-}@args:
+}:
 {
   imports = [
     # Common components this machine uses
@@ -38,46 +36,4 @@
   };
 
   environment.systemPackages = with pkgs; [ nvtopPackages.full ];
-
-  # nvidia gfx https://nixos.wiki/wiki/Nvidia
-  # =========
-  # Enable OpenGL
-  #hardware.opengl = {
-  #  enable = true;
-  #  driSupport = true;
-  #  driSupport32Bit = true;
-  #};
-
-  # Load nvidia driver for Xorg and Wayland
-  #services.xserver.videoDrivers = [ "nvidia" ];
-  #hardware.nvidia = {
-  # Modesetting is required.
-  #  modesetting.enable = true;
-
-  # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
-  # Enable this if you have graphical corruption issues or application crashes after waking
-  # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead 
-  # of just the bare essentials.
-  #  powerManagement.enable = false;
-
-  # Fine-grained power management. Turns off GPU when not in use.
-  # Experimental and only works on modern Nvidia GPUs (Turing or newer).
-  #  powerManagement.finegrained = false;
-
-  # Use the NVidia open source kernel module (not to be confused with the
-  # independent third-party "nouveau" open source driver).
-  # Support is limited to the Turing and later architectures. Full list of 
-  # supported GPUs is at: 
-  # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus 
-  # Only available from driver 515.43.04+
-  # Currently alpha-quality/buggy, so false is currently the recommended setting.
-  #  open = false;
-
-  # Enable the Nvidia settings menu,
-  # accessible via `nvidia-settings`.
-  #  nvidiaSettings = true;
-
-  # Optionally, you may need to select the appropriate driver version for your specific GPU.
-  #  package = config.boot.kernelPackages.nvidiaPackages.stable;
-  # };
 }

hosts/joe/configuration.nix

@@ -22,7 +22,7 @@
     (settings.usersDir + "/josh/configuration.nix")
   ];
 
-# test
+  # test
 
   networking.firewall.allowedTCPPorts = [
     34733 # sshd
@@ -43,31 +43,11 @@
   # nvidia gfx https://nixos.wiki/wiki/Nvidia
   # =========
   # Enable OpenGL
-  hardware.opengl = {
-    enable = true;
-    # driSupport = true;
-    driSupport32Bit = true;
-  };
+  hardware.opengl.driSupport32Bit = true;
+  hardware.graphics.enable = true;
 
-  # Load nvidia driver for Xorg and Wayland
-  virtualisation.docker = {
-    enableNvidia = true;
-    extraOptions = ''
-      --experimental
-      --add-runtime=nvidia=${pkgs.nvidia-docker}/bin/nvidia-container-runtime
-    '';
-  };
-  environment.etc."docker/daemon.json".text = ''
-    {
-      "runtimes": {
-        "nvidia": {
-          "path": "${pkgs.nvidia-docker}/bin/nvidia-container-runtime",
-          "runtimeArgs": []
-        }
-      }
-    }
-  '';
   services.xserver.videoDrivers = [ "nvidia" ];
+  hardware.nvidia-container-toolkit.enable = true;
   hardware.nvidia = {
     # Modesetting is required.
     modesetting.enable = true;