[machines] Updated sysidentity and moved stuff from configuration to hardware-configuration

3 files changed, 19 insertions, 19 deletions

diff --git a/machines/juno/configuration.nix b/machines/juno/configuration.nix
index 113be25..9e75d45 100644
--- a/machines/juno/configuration.nix
+++ b/machines/juno/configuration.nix
@@ -12,16 +12,4 @@
       ["level auto" 53 32767]
     ];
   };
-
-  # https://nixos.wiki/wiki/Accelerated_Video_Playback
-  nixpkgs.config.packageOverrides = pkgs: {
-    vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
-  };
-  hardware.opengl = {
-    enable = true;
-    extraPackages = with pkgs; [
-      intel-media-driver # LIBVA_DRIVER_NAME=iHD
-      vaapiIntel         # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
-    ];
-  };
 }
diff --git a/machines/juno/hardware-configuration.nix b/machines/juno/hardware-configuration.nix
index 3318aca..d732f30 100644
--- a/machines/juno/hardware-configuration.nix
+++ b/machines/juno/hardware-configuration.nix
@@ -1,9 +1,4 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
+{ config, lib, pkgs, modulesPath, ... }: {
   imports =
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
@@ -41,4 +36,17 @@
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  # Hardware acceleration
+  # https://nixos.wiki/wiki/Accelerated_Video_Playback
+  nixpkgs.config.packageOverrides = pkgs: {
+    vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
+  };
+  hardware.opengl = {
+    enable = true;
+    extraPackages = with pkgs; [
+      intel-media-driver # LIBVA_DRIVER_NAME=iHD
+      vaapiIntel         # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
+    ];
+  };
 }
diff --git a/machines/juno/sysidentity.nix b/machines/juno/sysidentity.nix
index 88a4e1c..e208076 100644
--- a/machines/juno/sysidentity.nix
+++ b/machines/juno/sysidentity.nix
@@ -1,7 +1,11 @@
+let
+  groups = import ../../module-groups.nix;
+in
 {
   sysidentity = {
     name = "juno";
-    type = "laptop";
     arch = "x86_64-linux";
+
+    drop = groups.non-laptop;
   };
 }